Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[safe/jmp/linux-2.6] / drivers / usb / host / sl811-hcd.c

diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 59be276..3b867a8 100644 (file)
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -51,6 +51,7 @@
 #include <asm/irq.h>
 #include <asm/system.h>
 #include <asm/byteorder.h>
+#include <asm/unaligned.h>
 
 #include "../core/hcd.h"
 #include "sl811.h"
@@ -58,6 +59,7 @@
 
 MODULE_DESCRIPTION("SL811HS USB Host Controller Driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:sl811-hcd");
 
 #define DRIVER_VERSION "19 May 2005"
 
@@ -93,12 +95,10 @@ static void port_power(struct sl811 *sl811, int is_on)
 
                sl811->port1 = (1 << USB_PORT_FEAT_POWER);
                sl811->irq_enable = SL11H_INTMASK_INSRMV;
-               hcd->self.controller->power.power_state = PMSG_ON;
        } else {
                sl811->port1 = 0;
                sl811->irq_enable = 0;
                hcd->state = HC_STATE_HALT;
-               hcd->self.controller->power.power_state = PMSG_SUSPEND;
        }
        sl811->ctrl1 = 0;
        sl811_write(sl811, SL11H_IRQ_ENABLE, 0);
@@ -231,7 +231,7 @@ static void in_packet(
        writeb(usb_pipedevice(urb->pipe), data_reg);
 
        sl811_write(sl811, bank + SL11H_HOSTCTLREG, control);
-       ep->length = min((int)len,
+       ep->length = min_t(u32, len,
                        urb->transfer_buffer_length - urb->actual_length);
        PACKET("IN%s/%d qh%p len%d\n", ep->nak_count ? "/retry" : "",
                        !!usb_gettoggle(urb->dev, ep->epnum, 0), ep, len);
@@ -256,7 +256,7 @@ static void out_packet(
        buf = urb->transfer_buffer + urb->actual_length;
        prefetch(buf);
 
-       len = min((int)ep->maxpacket,
+       len = min_t(u32, ep->maxpacket,
                        urb->transfer_buffer_length - urb->actual_length);
 
        if (!(control & SL11H_HCTLMASK_ISOCH)
@@ -720,8 +720,12 @@ retry:
                /* port status seems weird until after reset, so
                 * force the reset and make khubd clean up later.
                 */
-               sl811->port1 |= (1 << USB_PORT_FEAT_C_CONNECTION)
-                               | (1 << USB_PORT_FEAT_CONNECTION);
+               if (irqstat & SL11H_INTMASK_RD)
+                       sl811->port1 &= ~(1 << USB_PORT_FEAT_CONNECTION);
+               else
+                       sl811->port1 |= 1 << USB_PORT_FEAT_CONNECTION;
+
+               sl811->port1 |= 1 << USB_PORT_FEAT_C_CONNECTION;
 
        } else if (irqstat & SL11H_INTMASK_RD) {
                if (sl811->port1 & (1 << USB_PORT_FEAT_SUSPEND)) {
@@ -1027,7 +1031,7 @@ sl811h_endpoint_disable(struct usb_hcd *hcd, struct usb_host_endpoint *hep)
        if (!list_empty(&hep->urb_list))
                msleep(3);
        if (!list_empty(&hep->urb_list))
-               WARN("ep %p not empty?\n", ep);
+               WARNING("ep %p not empty?\n", ep);
 
        kfree(ep);
        hep->hcpriv = NULL;
@@ -1101,7 +1105,7 @@ sl811h_hub_descriptor (
        /* no overcurrent errors detection/handling */
        temp |= 0x0010;
 
-       desc->wHubCharacteristics = (__force __u16)cpu_to_le16(temp);
+       desc->wHubCharacteristics = cpu_to_le16(temp);
 
        /* two bitmaps:  ports removable, and legacy PortPwrCtrlMask */
        desc->bitmap[0] = 0 << 1;
@@ -1269,12 +1273,12 @@ sl811h_hub_control(
                sl811h_hub_descriptor(sl811, (struct usb_hub_descriptor *) buf);
                break;
        case GetHubStatus:
-               *(__le32 *) buf = cpu_to_le32(0);
+               put_unaligned_le32(0, buf);
                break;
        case GetPortStatus:
                if (wIndex != 1)
                        goto error;
-               *(__le32 *) buf = cpu_to_le32(sl811->port1);
+               put_unaligned_le32(sl811->port1, buf);
 
 #ifndef        VERBOSE
        if (*(u16*)(buf+2))     /* only if wPortChange is interesting */
@@ -1336,7 +1340,7 @@ static int
 sl811h_bus_suspend(struct usb_hcd *hcd)
 {
        // SOFs off
-       DBG("%s\n", __FUNCTION__);
+       DBG("%s\n", __func__);
        return 0;
 }
 
@@ -1344,7 +1348,7 @@ static int
 sl811h_bus_resume(struct usb_hcd *hcd)
 {
        // SOFs on
-       DBG("%s\n", __FUNCTION__);
+       DBG("%s\n", __func__);
        return 0;
 }
 
@@ -1507,15 +1511,7 @@ static const char proc_filename[] = "driver/sl811h";
 
 static void create_debug_file(struct sl811 *sl811)
 {
-       struct proc_dir_entry *pde;
-
-       pde = create_proc_entry(proc_filename, 0, NULL);
-       if (pde == NULL)
-               return;
-
-       pde->proc_fops = &proc_ops;
-       pde->data = sl811;
-       sl811->pde = pde;
+       sl811->pde = proc_create_data(proc_filename, 0, NULL, &proc_ops, sl811);
 }
 
 static void remove_debug_file(struct sl811 *sl811)
@@ -1629,22 +1625,26 @@ sl811h_probe(struct platform_device *dev)
 {
        struct usb_hcd          *hcd;
        struct sl811            *sl811;
-       struct resource         *addr, *data;
+       struct resource         *addr, *data, *ires;
        int                     irq;
        void __iomem            *addr_reg;
        void __iomem            *data_reg;
        int                     retval;
        u8                      tmp, ioaddr = 0;
+       unsigned long           irqflags;
 
        /* basic sanity checks first.  board-specific init logic should
         * have initialized these three resources and probably board
         * specific platform_data.  we don't probe for IRQs, and do only
         * minimal sanity checking.
         */
-       irq = platform_get_irq(dev, 0);
-       if (dev->num_resources < 3 || irq < 0)
+       ires = platform_get_resource(dev, IORESOURCE_IRQ, 0);
+       if (dev->num_resources < 3 || !ires)
                return -ENODEV;
 
+       irq = ires->start;
+       irqflags = ires->flags & IRQF_TRIGGER_MASK;
+
        /* refuse to confuse usbcore */
        if (dev->dev.dma_mask) {
                DBG("no we won't dma\n");
@@ -1683,7 +1683,7 @@ sl811h_probe(struct platform_device *dev)
        }
 
        /* allocate and initialize hcd */
-       hcd = usb_create_hcd(&sl811h_hc_driver, &dev->dev, dev->dev.bus_id);
+       hcd = usb_create_hcd(&sl811h_hc_driver, &dev->dev, dev_name(&dev->dev));
        if (!hcd) {
                retval = -ENOMEM;
                goto err5;
@@ -1726,8 +1726,11 @@ sl811h_probe(struct platform_device *dev)
         * triggers (e.g. most ARM CPUs).  Initial driver stress testing
         * was on a system with single edge triggering, so most sorts of
         * triggering arrangement should work.
+        *
+        * Use resource IRQ flags if set by platform device setup.
         */
-       retval = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
+       irqflags |= IRQF_SHARED;
+       retval = usb_add_hcd(hcd, irq, IRQF_DISABLED | irqflags);
        if (retval != 0)
                goto err6;
 
@@ -1771,8 +1774,6 @@ sl811h_suspend(struct platform_device *dev, pm_message_t state)
                port_power(sl811, 0);
                break;
        }
-       if (retval == 0)
-               dev->dev.power.power_state = state;
        return retval;
 }
 
@@ -1785,15 +1786,13 @@ sl811h_resume(struct platform_device *dev)
        /* with no "check to see if VBUS is still powered" board hook,
         * let's assume it'd only be powered to enable remote wakeup.
         */
-       if (dev->dev.power.power_state.event == PM_EVENT_SUSPEND
-                       || !device_can_wakeup(&hcd->self.root_hub->dev)) {
+       if (!sl811->port1 || !device_can_wakeup(&hcd->self.root_hub->dev)) {
                sl811->port1 = 0;
                port_power(sl811, 1);
                usb_root_hub_lost_power(hcd->self.root_hub);
                return 0;
        }
 
-       dev->dev.power.power_state = PMSG_ON;
        return sl811h_bus_resume(hcd);
 }