6 files changed, 35 insertions, 39 deletions

diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c
index df0a6369d2f2..1fc0871d2ef7 100644
--- a/drivers/net/can/usb/ems_usb.c
+++ b/drivers/net/can/usb/ems_usb.c
@@ -512,8 +512,8 @@ static void ems_usb_write_bulk_callback(struct urb *urb)
         netdev = dev->netdev;
 
         /* free up our allocated buffer */
-        usb_buffer_free(urb->dev, urb->transfer_buffer_length,
-                        urb->transfer_buffer, urb->transfer_dma);
+        usb_free_coherent(urb->dev, urb->transfer_buffer_length,
+                          urb->transfer_buffer, urb->transfer_dma);
 
         atomic_dec(&dev->active_tx_urbs);
 
@@ -610,8 +610,8 @@ static int ems_usb_start(struct ems_usb *dev)
                         return -ENOMEM;
                 }
 
-                buf = usb_buffer_alloc(dev->udev, RX_BUFFER_SIZE, GFP_KERNEL,
-                                       &urb->transfer_dma);
+                buf = usb_alloc_coherent(dev->udev, RX_BUFFER_SIZE, GFP_KERNEL,
+                                         &urb->transfer_dma);
                 if (!buf) {
                         dev_err(netdev->dev.parent,
                                 "No memory left for USB buffer\n");
@@ -631,8 +631,8 @@ static int ems_usb_start(struct ems_usb *dev)
                                 netif_device_detach(dev->netdev);
 
                         usb_unanchor_urb(urb);
-                        usb_buffer_free(dev->udev, RX_BUFFER_SIZE, buf,
-                                        urb->transfer_dma);
+                        usb_free_coherent(dev->udev, RX_BUFFER_SIZE, buf,
+                                          urb->transfer_dma);
                         break;
                 }
 
@@ -773,7 +773,7 @@ static netdev_tx_t ems_usb_start_xmit(struct sk_buff *skb, struct net_device *ne
                 goto nomem;
         }
 
-        buf = usb_buffer_alloc(dev->udev, size, GFP_ATOMIC, &urb->transfer_dma);
+        buf = usb_alloc_coherent(dev->udev, size, GFP_ATOMIC, &urb->transfer_dma);
         if (!buf) {
                 dev_err(netdev->dev.parent, "No memory left for USB buffer\n");
                 usb_free_urb(urb);
@@ -816,7 +816,7 @@ static netdev_tx_t ems_usb_start_xmit(struct sk_buff *skb, struct net_device *ne
          */
         if (!context) {
                 usb_unanchor_urb(urb);
-                usb_buffer_free(dev->udev, size, buf, urb->transfer_dma);
+                usb_free_coherent(dev->udev, size, buf, urb->transfer_dma);
 
                 dev_warn(netdev->dev.parent, "couldn't find free context\n");
 
@@ -841,7 +841,7 @@ static netdev_tx_t ems_usb_start_xmit(struct sk_buff *skb, struct net_device *ne
                 can_free_echo_skb(netdev, context->echo_index);
 
                 usb_unanchor_urb(urb);
-                usb_buffer_free(dev->udev, size, buf, urb->transfer_dma);
+                usb_free_coherent(dev->udev, size, buf, urb->transfer_dma);
                 dev_kfree_skb(skb);
 
                 atomic_dec(&dev->active_tx_urbs);
diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c
index 418825d26f90..197c352c47fb 100644
--- a/drivers/net/usb/ipheth.c
+++ b/drivers/net/usb/ipheth.c
@@ -128,17 +128,13 @@ static int ipheth_alloc_urbs(struct ipheth_device *iphone)
         if (rx_urb == NULL)
                 goto free_tx_urb;
 
-        tx_buf = usb_buffer_alloc(iphone->udev,
-                                  IPHETH_BUF_SIZE,
-                                  GFP_KERNEL,
-                                  &tx_urb->transfer_dma);
+        tx_buf = usb_alloc_coherent(iphone->udev, IPHETH_BUF_SIZE,
+                                    GFP_KERNEL, &tx_urb->transfer_dma);
         if (tx_buf == NULL)
                 goto free_rx_urb;
 
-        rx_buf = usb_buffer_alloc(iphone->udev,
-                                  IPHETH_BUF_SIZE,
-                                  GFP_KERNEL,
-                                  &rx_urb->transfer_dma);
+        rx_buf = usb_alloc_coherent(iphone->udev, IPHETH_BUF_SIZE,
+                                    GFP_KERNEL, &rx_urb->transfer_dma);
         if (rx_buf == NULL)
                 goto free_tx_buf;
 
@@ -150,8 +146,8 @@ static int ipheth_alloc_urbs(struct ipheth_device *iphone)
         return 0;
 
 free_tx_buf:
-        usb_buffer_free(iphone->udev, IPHETH_BUF_SIZE, tx_buf,
-                        tx_urb->transfer_dma);
+        usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, tx_buf,
+                          tx_urb->transfer_dma);
 free_rx_urb:
         usb_free_urb(rx_urb);
 free_tx_urb:
@@ -162,10 +158,10 @@ error_nomem:
 
 static void ipheth_free_urbs(struct ipheth_device *iphone)
 {
-        usb_buffer_free(iphone->udev, IPHETH_BUF_SIZE, iphone->rx_buf,
-                        iphone->rx_urb->transfer_dma);
-        usb_buffer_free(iphone->udev, IPHETH_BUF_SIZE, iphone->tx_buf,
-                        iphone->tx_urb->transfer_dma);
+        usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, iphone->rx_buf,
+                          iphone->rx_urb->transfer_dma);
+        usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, iphone->tx_buf,
+                          iphone->tx_urb->transfer_dma);
         usb_free_urb(iphone->rx_urb);
         usb_free_urb(iphone->tx_urb);
 }
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index 46890dc625dc..d6078b8c4273 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -1155,13 +1155,13 @@ err_fw:
         if (!kaweth->irq_urb)
                 goto err_tx_and_rx;
 
-        kaweth->intbuffer = usb_buffer_alloc(   kaweth->dev,
+        kaweth->intbuffer = usb_alloc_coherent( kaweth->dev,
                                                 INTBUFFERSIZE,
                                                 GFP_KERNEL,
                                                 &kaweth->intbufferhandle);
         if (!kaweth->intbuffer)
                 goto err_tx_and_rx_and_irq;
-        kaweth->rx_buf = usb_buffer_alloc(      kaweth->dev,
+        kaweth->rx_buf = usb_alloc_coherent(    kaweth->dev,
                                                 KAWETH_BUF_SIZE,
                                                 GFP_KERNEL,
                                                 &kaweth->rxbufferhandle);
@@ -1202,9 +1202,9 @@ err_fw:
 
 err_intfdata:
         usb_set_intfdata(intf, NULL);
-        usb_buffer_free(kaweth->dev, KAWETH_BUF_SIZE, (void *)kaweth->rx_buf, kaweth->rxbufferhandle);
+        usb_free_coherent(kaweth->dev, KAWETH_BUF_SIZE, (void *)kaweth->rx_buf, kaweth->rxbufferhandle);
 err_all_but_rxbuf:
-        usb_buffer_free(kaweth->dev, INTBUFFERSIZE, (void *)kaweth->intbuffer, kaweth->intbufferhandle);
+        usb_free_coherent(kaweth->dev, INTBUFFERSIZE, (void *)kaweth->intbuffer, kaweth->intbufferhandle);
 err_tx_and_rx_and_irq:
         usb_free_urb(kaweth->irq_urb);
 err_tx_and_rx:
@@ -1241,8 +1241,8 @@ static void kaweth_disconnect(struct usb_interface *intf)
         usb_free_urb(kaweth->tx_urb);
         usb_free_urb(kaweth->irq_urb);
 
-        usb_buffer_free(kaweth->dev, KAWETH_BUF_SIZE, (void *)kaweth->rx_buf, kaweth->rxbufferhandle);
-        usb_buffer_free(kaweth->dev, INTBUFFERSIZE, (void *)kaweth->intbuffer, kaweth->intbufferhandle);
+        usb_free_coherent(kaweth->dev, KAWETH_BUF_SIZE, (void *)kaweth->rx_buf, kaweth->rxbufferhandle);
+        usb_free_coherent(kaweth->dev, INTBUFFERSIZE, (void *)kaweth->intbuffer, kaweth->intbufferhandle);
 
         free_netdev(netdev);
 }
diff --git a/drivers/net/wimax/i2400m/usb.c b/drivers/net/wimax/i2400m/usb.c
index 16341ffc3df3..0d5081d77dc0 100644
--- a/drivers/net/wimax/i2400m/usb.c
+++ b/drivers/net/wimax/i2400m/usb.c
@@ -514,7 +514,7 @@ int i2400mu_probe(struct usb_interface *iface,
         iface->needs_remote_wakeup = 1;         /* autosuspend (15s delay) */
         device_init_wakeup(dev, 1);
         usb_dev->autosuspend_delay = 15 * HZ;
-        usb_dev->autosuspend_disabled = 0;
+        usb_enable_autosuspend(usb_dev);
 #endif
 
         result = i2400m_setup(i2400m, I2400M_BRI_MAC_REINIT);
diff --git a/drivers/net/wireless/ath/ar9170/usb.c b/drivers/net/wireless/ath/ar9170/usb.c
index abd083a357f5..82ab532a4923 100644
--- a/drivers/net/wireless/ath/ar9170/usb.c
+++ b/drivers/net/wireless/ath/ar9170/usb.c
@@ -215,7 +215,7 @@ resubmit:
         return;
 
 free:
-        usb_buffer_free(aru->udev, 64, urb->transfer_buffer, urb->transfer_dma);
+        usb_free_coherent(aru->udev, 64, urb->transfer_buffer, urb->transfer_dma);
 }
 
 static void ar9170_usb_rx_completed(struct urb *urb)
@@ -296,7 +296,7 @@ static int ar9170_usb_alloc_rx_irq_urb(struct ar9170_usb *aru)
         if (!urb)
                 goto out;
 
-        ibuf = usb_buffer_alloc(aru->udev, 64, GFP_KERNEL, &urb->transfer_dma);
+        ibuf = usb_alloc_coherent(aru->udev, 64, GFP_KERNEL, &urb->transfer_dma);
         if (!ibuf)
                 goto out;
 
@@ -309,8 +309,8 @@ static int ar9170_usb_alloc_rx_irq_urb(struct ar9170_usb *aru)
         err = usb_submit_urb(urb, GFP_KERNEL);
         if (err) {
                 usb_unanchor_urb(urb);
-                usb_buffer_free(aru->udev, 64, urb->transfer_buffer,
-                                urb->transfer_dma);
+                usb_free_coherent(aru->udev, 64, urb->transfer_buffer,
+                                  urb->transfer_dma);
         }
 
 out:
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
index d91ad1a612af..c257940b71b6 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -664,15 +664,15 @@ static struct urb *alloc_rx_urb(struct zd_usb *usb)
         urb = usb_alloc_urb(0, GFP_KERNEL);
         if (!urb)
                 return NULL;
-        buffer = usb_buffer_alloc(udev, USB_MAX_RX_SIZE, GFP_KERNEL,
-                                  &urb->transfer_dma);
+        buffer = usb_alloc_coherent(udev, USB_MAX_RX_SIZE, GFP_KERNEL,
+                                    &urb->transfer_dma);
         if (!buffer) {
                 usb_free_urb(urb);
                 return NULL;
         }
 
         usb_fill_bulk_urb(urb, udev, usb_rcvbulkpipe(udev, EP_DATA_IN),
-                          buffer, USB_MAX_RX_SIZE,
+                          buffer, USB_MAX_RX_SIZE,
                           rx_urb_complete, usb);
         urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
 
@@ -683,8 +683,8 @@ static void free_rx_urb(struct urb *urb)
 {
         if (!urb)
                 return;
-        usb_buffer_free(urb->dev, urb->transfer_buffer_length,
-                        urb->transfer_buffer, urb->transfer_dma);
+        usb_free_coherent(urb->dev, urb->transfer_buffer_length,
+                          urb->transfer_buffer, urb->transfer_dma);
         usb_free_urb(urb);
 }