Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 16 insertions, 28 deletions

diff --git a/drivers/usb/host/isp1362-hcd.c b/drivers/usb/host/isp1362-hcd.c
index 0587ad4ce5c2..9c37dad3e816 100644
--- a/drivers/usb/host/isp1362-hcd.c
+++ b/drivers/usb/host/isp1362-hcd.c
@@ -70,7 +70,6 @@
 #include <linux/ioport.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/list.h>
@@ -82,6 +81,7 @@
 #include <linux/pm.h>
 #include <linux/io.h>
 #include <linux/bitmap.h>
+#include <linux/prefetch.h>
 
 #include <asm/irq.h>
 #include <asm/system.h>
@@ -227,7 +227,6 @@ static int claim_ptd_buffers(struct isp1362_ep_queue *epq,
 
 static inline void release_ptd_buffers(struct isp1362_ep_queue *epq, struct isp1362_ep *ep)
 {
-        int index = ep->ptd_index;
         int last = ep->ptd_index + ep->num_ptds;
 
         if (last > epq->buf_count)
@@ -237,10 +236,8 @@ static inline void release_ptd_buffers(struct isp1362_ep_queue *epq, struct isp1
                     epq->buf_map, epq->skip_map);
         BUG_ON(last > epq->buf_count);
 
-        for (; index < last; index++) {
-                __clear_bit(index, &epq->buf_map);
-                __set_bit(index, &epq->skip_map);
-        }
+        bitmap_clear(&epq->buf_map, ep->ptd_index, ep->num_ptds);
+        bitmap_set(&epq->skip_map, ep->ptd_index, ep->num_ptds);
         epq->buf_avail += ep->num_ptds;
         epq->ptd_count--;
 
@@ -550,7 +547,7 @@ static void postproc_ep(struct isp1362_hcd *isp1362_hcd, struct isp1362_ep *ep)
                         if (usb_pipecontrol(urb->pipe)) {
                                 ep->nextpid = USB_PID_ACK;
                                 /* save the data underrun error code for later and
-                                 * procede with the status stage
+                                 * proceed with the status stage
                                  */
                                 urb->actual_length += PTD_GET_COUNT(ptd);
                                 BUG_ON(urb->actual_length > urb->transfer_buffer_length);
@@ -1556,9 +1553,9 @@ static void isp1362_hub_descriptor(struct isp1362_hcd *isp1362_hcd,
         desc->wHubCharacteristics = cpu_to_le16((reg >> 8) & 0x1f);
         DBG(0, "%s: hubcharacteristics = %02x\n", __func__, cpu_to_le16((reg >> 8) & 0x1f));
         desc->bPwrOn2PwrGood = (reg >> 24) & 0xff;
-        /* two bitmaps:  ports removable, and legacy PortPwrCtrlMask */
-        desc->bitmap[0] = desc->bNbrPorts == 1 ? 1 << 1 : 3 << 1;
-        desc->bitmap[1] = ~0;
+        /* ports removable, and legacy PortPwrCtrlMask */
+        desc->u.hs.DeviceRemovable[0] = desc->bNbrPorts == 1 ? 1 << 1 : 3 << 1;
+        desc->u.hs.DeviceRemovable[1] = ~0;
 
         DBG(3, "%s: exit\n", __func__);
 }
@@ -1676,13 +1673,6 @@ static int isp1362_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                 switch (wValue) {
                 case USB_PORT_FEAT_SUSPEND:
                         _DBG(0, "USB_PORT_FEAT_SUSPEND\n");
-#ifdef  CONFIG_USB_OTG
-                        if (ohci->hcd.self.otg_port == (wIndex + 1) &&
-                            ohci->hcd.self.b_hnp_enable) {
-                                start_hnp(ohci);
-                                break;
-                        }
-#endif
                         spin_lock_irqsave(&isp1362_hcd->lock, flags);
                         isp1362_write_reg32(isp1362_hcd, HCRHPORT1 + wIndex, RH_PS_PSS);
                         isp1362_hcd->rhport[wIndex] =
@@ -2656,8 +2646,6 @@ static struct hc_driver isp1362_hc_driver = {
 
 /*-------------------------------------------------------------------------*/
 
-#define resource_len(r) (((r)->end - (r)->start) + 1)
-
 static int __devexit isp1362_remove(struct platform_device *pdev)
 {
         struct usb_hcd *hcd = platform_get_drvdata(pdev);
@@ -2679,12 +2667,12 @@ static int __devexit isp1362_remove(struct platform_device *pdev)
         res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
         DBG(0, "%s: release mem_region: %08lx\n", __func__, (long unsigned int)res->start);
         if (res)
-                release_mem_region(res->start, resource_len(res));
+                release_mem_region(res->start, resource_size(res));
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         DBG(0, "%s: release mem_region: %08lx\n", __func__, (long unsigned int)res->start);
         if (res)
-                release_mem_region(res->start, resource_len(res));
+                release_mem_region(res->start, resource_size(res));
 
         DBG(0, "%s: put_hcd\n", __func__);
         usb_put_hcd(hcd);
@@ -2693,7 +2681,7 @@ static int __devexit isp1362_remove(struct platform_device *pdev)
         return 0;
 }
 
-static int __init isp1362_probe(struct platform_device *pdev)
+static int __devinit isp1362_probe(struct platform_device *pdev)
 {
         struct usb_hcd *hcd;
         struct isp1362_hcd *isp1362_hcd;
@@ -2730,21 +2718,21 @@ static int __init isp1362_probe(struct platform_device *pdev)
                 goto err1;
         }
 
-        if (!request_mem_region(addr->start, resource_len(addr), hcd_name)) {
+        if (!request_mem_region(addr->start, resource_size(addr), hcd_name)) {
                 retval = -EBUSY;
                 goto err1;
         }
-        addr_reg = ioremap(addr->start, resource_len(addr));
+        addr_reg = ioremap(addr->start, resource_size(addr));
         if (addr_reg == NULL) {
                 retval = -ENOMEM;
                 goto err2;
         }
 
-        if (!request_mem_region(data->start, resource_len(data), hcd_name)) {
+        if (!request_mem_region(data->start, resource_size(data), hcd_name)) {
                 retval = -EBUSY;
                 goto err3;
         }
-        data_reg = ioremap(data->start, resource_len(data));
+        data_reg = ioremap(data->start, resource_size(data));
         if (data_reg == NULL) {
                 retval = -ENOMEM;
                 goto err4;
@@ -2802,13 +2790,13 @@ static int __init isp1362_probe(struct platform_device *pdev)
         iounmap(data_reg);
  err4:
         DBG(0, "%s: Releasing mem region %08lx\n", __func__, (long unsigned int)data->start);
-        release_mem_region(data->start, resource_len(data));
+        release_mem_region(data->start, resource_size(data));
  err3:
         DBG(0, "%s: Unmapping addr_reg @ %p\n", __func__, addr_reg);
         iounmap(addr_reg);
  err2:
         DBG(0, "%s: Releasing mem region %08lx\n", __func__, (long unsigned int)addr->start);
-        release_mem_region(addr->start, resource_len(addr));
+        release_mem_region(addr->start, resource_size(addr));
  err1:
         pr_err("%s: init error, %d\n", __func__, retval);