14 files changed, 14 insertions, 48 deletions

diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
index 8e184e2641cb..79861ee12a29 100644
--- a/drivers/usb/atm/cxacru.c
+++ b/drivers/usb/atm/cxacru.c
@@ -715,13 +715,11 @@ static int cxacru_bind(struct usbatm_data *usbatm_instance,
                         usb_dev, usb_rcvintpipe(usb_dev, CXACRU_EP_CMD),
                         instance->rcv_buf, PAGE_SIZE,
                         cxacru_blocking_completion, &instance->rcv_done, 1);
-        instance->rcv_urb->transfer_flags |= URB_ASYNC_UNLINK;
 
         usb_fill_int_urb(instance->snd_urb,
                         usb_dev, usb_sndintpipe(usb_dev, CXACRU_EP_CMD),
                         instance->snd_buf, PAGE_SIZE,
                         cxacru_blocking_completion, &instance->snd_done, 4);
-        instance->snd_urb->transfer_flags |= URB_ASYNC_UNLINK;
 
         init_MUTEX(&instance->cm_serialize);
 
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 88d1b376f67c..74197249c245 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -48,7 +48,6 @@ static int usb_start_wait_urb(struct urb *urb, int timeout, int* actual_length)
 
         init_completion(&done);         
         urb->context = &done;
-        urb->transfer_flags |= URB_ASYNC_UNLINK;
         urb->actual_length = 0;
         status = usb_submit_urb(urb, GFP_NOIO);
 
@@ -357,8 +356,7 @@ int usb_sg_init (
         if (!io->urbs)
                 goto nomem;
 
-        urb_flags = URB_ASYNC_UNLINK | URB_NO_TRANSFER_DMA_MAP
-                        | URB_NO_INTERRUPT;
+        urb_flags = URB_NO_TRANSFER_DMA_MAP | URB_NO_INTERRUPT;
         if (usb_pipein (pipe))
                 urb_flags |= URB_SHORT_NOT_OK;
 
diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c
index c0feee25ff0a..c846fefb7386 100644
--- a/drivers/usb/core/urb.c
+++ b/drivers/usb/core/urb.c
@@ -309,9 +309,8 @@ int usb_submit_urb(struct urb *urb, unsigned mem_flags)
         unsigned int    allowed;
 
         /* enforce simple/standard policy */
-        allowed = URB_ASYNC_UNLINK;     // affects later unlinks
-        allowed |= (URB_NO_TRANSFER_DMA_MAP | URB_NO_SETUP_DMA_MAP);
-        allowed |= URB_NO_INTERRUPT;
+        allowed = (URB_NO_TRANSFER_DMA_MAP | URB_NO_SETUP_DMA_MAP |
+                        URB_NO_INTERRUPT);
         switch (temp) {
         case PIPE_BULK:
                 if (is_out)
@@ -400,14 +399,8 @@ int usb_submit_urb(struct urb *urb, unsigned mem_flags)
  * canceled (rather than any other code) and will quickly be removed
  * from host controller data structures.
  *
- * In the past, clearing the URB_ASYNC_UNLINK transfer flag for the
- * URB indicated that the request was synchronous.  This usage is now
- * deprecated; if the flag is clear the call will be forwarded to
- * usb_kill_urb() and the return value will be 0.  In the future, drivers
- * should call usb_kill_urb() directly for synchronous unlinking.
- *
- * When the URB_ASYNC_UNLINK transfer flag for the URB is set, this
- * request is asynchronous.  Success is indicated by returning -EINPROGRESS,
+ * This request is always asynchronous.
+ * Success is indicated by returning -EINPROGRESS,
  * at which time the URB will normally have been unlinked but not yet
  * given back to the device driver.  When it is called, the completion
  * function will see urb->status == -ECONNRESET.  Failure is indicated
@@ -453,17 +446,6 @@ int usb_unlink_urb(struct urb *urb)
 {
         if (!urb)
                 return -EINVAL;
-        if (!(urb->transfer_flags & URB_ASYNC_UNLINK)) {
-#ifdef CONFIG_DEBUG_KERNEL
-                if (printk_ratelimit()) {
-                        printk(KERN_NOTICE "usb_unlink_urb() is deprecated for "
-                                "synchronous unlinks.  Use usb_kill_urb() instead.\n");
-                        WARN_ON(1);
-                }
-#endif
-                usb_kill_urb(urb);
-                return 0;
-        }
         if (!(urb->dev && urb->dev->bus && urb->dev->bus->op))
                 return -ENODEV;
         return urb->dev->bus->op->unlink_urb(urb, -ECONNRESET);
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c
index 719c0316cc39..1ab95d24c5e2 100644
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
@@ -1688,7 +1688,7 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
                         usb_fill_int_urb(hid->urbin, dev, pipe, hid->inbuf, 0,
                                          hid_irq_in, hid, interval);
                         hid->urbin->transfer_dma = hid->inbuf_dma;
-                        hid->urbin->transfer_flags |=(URB_NO_TRANSFER_DMA_MAP | URB_ASYNC_UNLINK);
+                        hid->urbin->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
                 } else {
                         if (hid->urbout)
                                 continue;
@@ -1698,7 +1698,7 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
                         usb_fill_int_urb(hid->urbout, dev, pipe, hid->outbuf, 0,
                                          hid_irq_out, hid, interval);
                         hid->urbout->transfer_dma = hid->outbuf_dma;
-                        hid->urbout->transfer_flags |= (URB_NO_TRANSFER_DMA_MAP | URB_ASYNC_UNLINK);
+                        hid->urbout->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
                 }
         }
 
@@ -1750,7 +1750,7 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
                              hid->ctrlbuf, 1, hid_ctrl, hid);
         hid->urbctrl->setup_dma = hid->cr_dma;
         hid->urbctrl->transfer_dma = hid->ctrlbuf_dma;
-        hid->urbctrl->transfer_flags |= (URB_NO_TRANSFER_DMA_MAP | URB_NO_SETUP_DMA_MAP | URB_ASYNC_UNLINK);
+        hid->urbctrl->transfer_flags |= (URB_NO_TRANSFER_DMA_MAP | URB_NO_SETUP_DMA_MAP);
 
         return hid;
 
diff --git a/drivers/usb/misc/auerswald.c b/drivers/usb/misc/auerswald.c
index 6f7994f5a714..ae4681f9f0ea 100644
--- a/drivers/usb/misc/auerswald.c
+++ b/drivers/usb/misc/auerswald.c
@@ -426,7 +426,7 @@ static int auerchain_submit_urb (pauerchain_t acp, struct urb * urb)
 
 /* cancel an urb which is submitted to the chain
    the result is 0 if the urb is cancelled, or -EINPROGRESS if
-   URB_ASYNC_UNLINK is set and the function is successfully started.
+   the function is successfully started.
 */
 static int auerchain_unlink_urb (pauerchain_t acp, struct urb * urb)
 {
@@ -515,7 +515,6 @@ static void auerchain_unlink_all (pauerchain_t acp)
         acep = acp->active;
         if (acep) {
                 urbp = acep->urbp;
-                urbp->transfer_flags &= ~URB_ASYNC_UNLINK;
                 dbg ("unlink active urb");
                 usb_kill_urb (urbp);
         }
diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c
index 2fd12264fd53..d63ce6c030f3 100644
--- a/drivers/usb/misc/sisusbvga/sisusb.c
+++ b/drivers/usb/misc/sisusbvga/sisusb.c
@@ -229,7 +229,7 @@ sisusb_bulkout_msg(struct sisusb_usb_data *sisusb, int index, unsigned int pipe,
         usb_fill_bulk_urb(urb, sisusb->sisusb_dev, pipe, data, len,
                 sisusb_bulk_completeout, &sisusb->urbout_context[index]);
 
-        urb->transfer_flags |= (tflags | URB_ASYNC_UNLINK);
+        urb->transfer_flags |= tflags;
         urb->actual_length = 0;
 
         if ((urb->transfer_dma = transfer_dma))
@@ -295,7 +295,7 @@ sisusb_bulkin_msg(struct sisusb_usb_data *sisusb, unsigned int pipe, void *data,
         usb_fill_bulk_urb(urb, sisusb->sisusb_dev, pipe, data, len,
                         sisusb_bulk_completein, sisusb);
 
-        urb->transfer_flags |= (tflags | URB_ASYNC_UNLINK);
+        urb->transfer_flags |= tflags;
         urb->actual_length = 0;
 
         if ((urb->transfer_dma = transfer_dma))
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index fd7fb98e4b20..54799eb0bc60 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -986,7 +986,6 @@ test_ctrl_queue (struct usbtest_dev *dev, struct usbtest_param *param)
 
                 u->context = &context;
                 u->complete = ctrl_complete;
-                u->transfer_flags |= URB_ASYNC_UNLINK;
         }
 
         /* queue the urbs */
@@ -1052,7 +1051,6 @@ static int unlink1 (struct usbtest_dev *dev, int pipe, int size, int async)
         urb = simple_alloc_urb (testdev_to_usbdev (dev), pipe, size);
         if (!urb)
                 return -ENOMEM;
-        urb->transfer_flags |= URB_ASYNC_UNLINK;
         urb->context = &completion;
         urb->complete = unlink1_callback;
 
diff --git a/drivers/usb/net/catc.c b/drivers/usb/net/catc.c
index c8be912f24e1..37ef365a2472 100644
--- a/drivers/usb/net/catc.c
+++ b/drivers/usb/net/catc.c
@@ -383,7 +383,6 @@ static void catc_tx_done(struct urb *urb, struct pt_regs *regs)
 
         if (urb->status == -ECONNRESET) {
                 dbg("Tx Reset.");
-                urb->transfer_flags &= ~URB_ASYNC_UNLINK;
                 urb->status = 0;
                 catc->netdev->trans_start = jiffies;
                 catc->stats.tx_errors++;
@@ -445,7 +444,6 @@ static void catc_tx_timeout(struct net_device *netdev)
         struct catc *catc = netdev_priv(netdev);
 
         warn("Transmit timed out.");
-        catc->tx_urb->transfer_flags |= URB_ASYNC_UNLINK;
         usb_unlink_urb(catc->tx_urb);
 }
 
diff --git a/drivers/usb/net/kaweth.c b/drivers/usb/net/kaweth.c
index 7ffa99b9760f..e04b0ce3611a 100644
--- a/drivers/usb/net/kaweth.c
+++ b/drivers/usb/net/kaweth.c
@@ -787,7 +787,6 @@ static int kaweth_start_xmit(struct sk_buff *skb, struct net_device *net)
                       kaweth_usb_transmit_complete,
                       kaweth);
         kaweth->end = 0;
-        kaweth->tx_urb->transfer_flags |= URB_ASYNC_UNLINK;
 
         if((res = usb_submit_urb(kaweth->tx_urb, GFP_ATOMIC)))
         {
diff --git a/drivers/usb/net/pegasus.c b/drivers/usb/net/pegasus.c
index fcd6d3ccef44..7484d34780fc 100644
--- a/drivers/usb/net/pegasus.c
+++ b/drivers/usb/net/pegasus.c
@@ -825,7 +825,6 @@ static void pegasus_tx_timeout(struct net_device *net)
         pegasus_t *pegasus = netdev_priv(net);
         if (netif_msg_timer(pegasus))
                 printk(KERN_WARNING "%s: tx timeout\n", net->name);
-        pegasus->tx_urb->transfer_flags |= URB_ASYNC_UNLINK;
         usb_unlink_urb(pegasus->tx_urb);
         pegasus->stats.tx_errors++;
 }
diff --git a/drivers/usb/net/rtl8150.c b/drivers/usb/net/rtl8150.c
index 59ab40ebb394..c3d4e3589e30 100644
--- a/drivers/usb/net/rtl8150.c
+++ b/drivers/usb/net/rtl8150.c
@@ -653,7 +653,6 @@ static void rtl8150_tx_timeout(struct net_device *netdev)
 {
         rtl8150_t *dev = netdev_priv(netdev);
         warn("%s: Tx timeout.", netdev->name);
-        dev->tx_urb->transfer_flags |= URB_ASYNC_UNLINK;
         usb_unlink_urb(dev->tx_urb);
         dev->stats.tx_errors++;
 }
diff --git a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c
index 4682696450db..3c6eef4168e5 100644
--- a/drivers/usb/net/usbnet.c
+++ b/drivers/usb/net/usbnet.c
@@ -2987,7 +2987,6 @@ static void rx_submit (struct usbnet *dev, struct urb *urb, unsigned flags)
 
         usb_fill_bulk_urb (urb, dev->udev, dev->in,
                 skb->data, size, rx_complete, skb);
-        urb->transfer_flags |= URB_ASYNC_UNLINK;
 
         spin_lock_irqsave (&dev->rxq.lock, lockflags);
 
@@ -3561,7 +3560,6 @@ static int usbnet_start_xmit (struct sk_buff *skb, struct net_device *net)
 
         usb_fill_bulk_urb (urb, dev->udev, dev->out,
                         skb->data, skb->len, tx_complete, skb);
-        urb->transfer_flags |= URB_ASYNC_UNLINK;
 
         /* don't assume the hardware handles USB_ZERO_PACKET
          * NOTE:  strictly conforming cdc-ether devices should expect
diff --git a/drivers/usb/net/zd1201.c b/drivers/usb/net/zd1201.c
index fc013978837e..c4e479ee926a 100644
--- a/drivers/usb/net/zd1201.c
+++ b/drivers/usb/net/zd1201.c
@@ -847,7 +847,6 @@ static void zd1201_tx_timeout(struct net_device *dev)
                 return;
         dev_warn(&zd->usb->dev, "%s: TX timeout, shooting down urb\n",
             dev->name);
-        zd->tx_urb->transfer_flags |= URB_ASYNC_UNLINK;
         usb_unlink_urb(zd->tx_urb);
         zd->stats.tx_errors++;
         /* Restart the timeout to quiet the watchdog: */
diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c
index e42875152c34..c1ba5301ebfc 100644
--- a/drivers/usb/storage/transport.c
+++ b/drivers/usb/storage/transport.c
@@ -96,8 +96,8 @@
  * or before the URB_ACTIVE bit was set.  If so, it's essential to cancel
  * the URB if it hasn't been cancelled already (i.e., if the URB_ACTIVE bit
  * is still set).  Either way, the function must then wait for the URB to
- * finish.  Note that because the URB_ASYNC_UNLINK flag is set, the URB can
- * still be in progress even after a call to usb_unlink_urb() returns.
+ * finish.  Note that the URB can still be in progress even after a call to
+ * usb_unlink_urb() returns.
  *
  * The idea is that (1) once the ABORTING or DISCONNECTING bit is set,
  * either the stop_transport() function or the submitting function
@@ -158,8 +158,7 @@ static int usb_stor_msg_common(struct us_data *us, int timeout)
          * hasn't been mapped for DMA.  Yes, this is clunky, but it's
          * easier than always having the caller tell us whether the
          * transfer buffer has already been mapped. */
-        us->current_urb->transfer_flags =
-                        URB_ASYNC_UNLINK | URB_NO_SETUP_DMA_MAP;
+        us->current_urb->transfer_flags = URB_NO_SETUP_DMA_MAP;
         if (us->current_urb->transfer_buffer == us->iobuf)
                 us->current_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
         us->current_urb->transfer_dma = us->iobuf_dma;