vserver 2.0 rc7

[linux-2.6.git] / drivers / usb / host / ohci-au1xxx.c

diff --git a/drivers/usb/host/ohci-au1xxx.c b/drivers/usb/host/ohci-au1xxx.c
index ee8503a..3981bf1 100644 (file)
--- a/drivers/usb/host/ohci-au1xxx.c
+++ b/drivers/usb/host/ohci-au1xxx.c
@@ -70,19 +70,6 @@ static void au1xxx_stop_hc(struct platform_device *dev)
 
 /*-------------------------------------------------------------------------*/
 
-
-static irqreturn_t usb_hcd_au1xxx_hcim_irq (int irq, void *__hcd,
-                                            struct pt_regs * r)
-{
-       struct usb_hcd *hcd = __hcd;
-
-       return usb_hcd_irq(irq, hcd, r);
-}
-
-/*-------------------------------------------------------------------------*/
-
-void usb_hcd_au1xxx_remove (struct usb_hcd *, struct platform_device *);
-
 /* configure so an HC device and id are always provided */
 /* always called with process context; sleeping is OK */
 
@@ -97,90 +84,48 @@ void usb_hcd_au1xxx_remove (struct usb_hcd *, struct platform_device *);
  *
  */
 int usb_hcd_au1xxx_probe (const struct hc_driver *driver,
-                         struct usb_hcd **hcd_out,
                          struct platform_device *dev)
 {
        int retval;
-       struct usb_hcd *hcd = 0;
-
-       unsigned int *addr = NULL;
-
-       if (!request_mem_region(dev->resource[0].start,
-                               dev->resource[0].end
-                               - dev->resource[0].start + 1, hcd_name)) {
-               pr_debug("request_mem_region failed");
-               return -EBUSY;
-       }
-
-       au1xxx_start_hc(dev);
-
-       addr = ioremap(dev->resource[0].start,
-                      dev->resource[0].end
-                      - dev->resource[0].start + 1);
-       if (!addr) {
-               pr_debug("ioremap failed");
-               retval = -ENOMEM;
-               goto err1;
-       }
+       struct usb_hcd *hcd;
 
        if(dev->resource[1].flags != IORESOURCE_IRQ) {
                pr_debug ("resource[1] is not IORESOURCE_IRQ");
-               retval = -ENOMEM;
-               goto err1;
+               return -ENOMEM;
        }
 
-       hcd = usb_create_hcd(driver);
-       if (hcd == NULL) {
-               pr_debug ("usb_create_hcd failed");
-               retval = -ENOMEM;
+       hcd = usb_create_hcd(driver, &dev->dev, "au1xxx");
+       if (!hcd)
+               return -ENOMEM;
+       hcd->rsrc_start = dev->resource[0].start;
+       hcd->rsrc_len = dev->resource[0].end - dev->resource[0].start + 1;
+
+       if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
+               pr_debug("request_mem_region failed");
+               retval = -EBUSY;
                goto err1;
        }
-       ohci_hcd_init(hcd_to_ohci(hcd));
-
-       hcd->irq = dev->resource[1].start;
-       hcd->regs = addr;
-       hcd->self.controller = &dev->dev;
 
-       retval = hcd_buffer_create (hcd);
-       if (retval != 0) {
-               pr_debug ("pool alloc fail");
+       hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
+       if (!hcd->regs) {
+               pr_debug("ioremap failed");
+               retval = -ENOMEM;
                goto err2;
        }
 
-       retval = request_irq (hcd->irq, usb_hcd_au1xxx_hcim_irq, SA_INTERRUPT,
-                             hcd->driver->description, hcd);
-       if (retval != 0) {
-               pr_debug("request_irq failed");
-               retval = -EBUSY;
-               goto err3;
-       }
-
-       pr_debug ("%s (Au1xxx) at 0x%p, irq %d",
-            hcd->driver->description, hcd->regs, hcd->irq);
-
-       hcd->self.bus_name = "au1xxx";
-
-       usb_register_bus (&hcd->self);
+       au1xxx_start_hc(dev);
+       ohci_hcd_init(hcd_to_ohci(hcd));
 
-       if ((retval = driver->start (hcd)) < 0)
-       {
-               usb_hcd_au1xxx_remove(hcd, dev);
-               printk("bad driver->start\n");
+       retval = usb_add_hcd(hcd, dev->resource[1].start, SA_INTERRUPT);
+       if (retval == 0)
                return retval;
-       }
 
-       *hcd_out = hcd;
-       return 0;
-
- err3:
-       hcd_buffer_destroy (hcd);
+       au1xxx_stop_hc(dev);
+       iounmap(hcd->regs);
  err2:
-       usb_put_hcd(hcd);
+       release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
  err1:
-       au1xxx_stop_hc(dev);
-       release_mem_region(dev->resource[0].start,
-                               dev->resource[0].end
-                          - dev->resource[0].start + 1);
+       usb_put_hcd(hcd);
        return retval;
 }
 
@@ -200,28 +145,11 @@ int usb_hcd_au1xxx_probe (const struct hc_driver *driver,
  */
 void usb_hcd_au1xxx_remove (struct usb_hcd *hcd, struct platform_device *dev)
 {
-       pr_debug ("remove: %s, state %x", hcd->self.bus_name, hcd->state);
-
-       if (in_interrupt ())
-               BUG ();
-
-       hcd->state = USB_STATE_QUIESCING;
-
-       pr_debug ("%s: roothub graceful disconnect", hcd->self.bus_name);
-       usb_disconnect (&hcd->self.root_hub);
-
-       hcd->driver->stop (hcd);
-       hcd->state = USB_STATE_HALT;
-
-       free_irq (hcd->irq, hcd);
-       hcd_buffer_destroy (hcd);
-
-       usb_deregister_bus (&hcd->self);
-
+       usb_remove_hcd(hcd);
        au1xxx_stop_hc(dev);
-       release_mem_region(dev->resource[0].start,
-                          dev->resource[0].end
-                          - dev->resource[0].start + 1);
+       iounmap(hcd->regs);
+       release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+       usb_put_hcd(hcd);
 }
 
 /*-------------------------------------------------------------------------*/
@@ -257,7 +185,7 @@ static const struct hc_driver ohci_au1xxx_hc_driver = {
         * generic hardware linkage
         */
        .irq =                  ohci_irq,
-       .flags =                HCD_USB11,
+       .flags =                HCD_USB11 | HCD_MEMORY,
 
        /*
         * basic lifecycle operations
@@ -293,7 +221,6 @@ static const struct hc_driver ohci_au1xxx_hc_driver = {
 static int ohci_hcd_au1xxx_drv_probe(struct device *dev)
 {
        struct platform_device *pdev = to_platform_device(dev);
-       struct usb_hcd *hcd = NULL;
        int ret;
 
        pr_debug ("In ohci_hcd_au1xxx_drv_probe");
@@ -301,11 +228,7 @@ static int ohci_hcd_au1xxx_drv_probe(struct device *dev)
        if (usb_disabled())
                return -ENODEV;
 
-       ret = usb_hcd_au1xxx_probe(&ohci_au1xxx_hc_driver, &hcd, pdev);
-
-       if (ret == 0)
-               dev_set_drvdata(dev, hcd);
-
+       ret = usb_hcd_au1xxx_probe(&ohci_au1xxx_hc_driver, pdev);
        return ret;
 }
 
@@ -315,7 +238,6 @@ static int ohci_hcd_au1xxx_drv_remove(struct device *dev)
        struct usb_hcd *hcd = dev_get_drvdata(dev);
 
        usb_hcd_au1xxx_remove(hcd, pdev);
-       dev_set_drvdata(dev, NULL);
        return 0;
 }
        /*TBD*/