USB: usb dev_name() instead of dev->bus_id

[linux-2.6-omap-h63xx.git] / drivers / usb / host / ohci-sm501.c

diff --git a/drivers/usb/host/ohci-sm501.c b/drivers/usb/host/ohci-sm501.c
index 4ea92762fb289521431431c8af5ae8b3475b5261..21b164e4abebf8bc71d12611b4356bb97e038718 100644 (file)
--- a/drivers/usb/host/ohci-sm501.c
+++ b/drivers/usb/host/ohci-sm501.c
@@ -91,7 +91,7 @@ static int ohci_hcd_sm501_drv_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct resource *res, *mem;
        int retval, irq;
-       struct usb_hcd *hcd = 0;
+       struct usb_hcd *hcd = NULL;
 
        irq = retval = platform_get_irq(pdev, 0);
        if (retval < 0)
@@ -143,7 +143,7 @@ static int ohci_hcd_sm501_drv_probe(struct platform_device *pdev)
                goto err2;
        }
 
-       hcd = usb_create_hcd(driver, &pdev->dev, pdev->dev.bus_id);
+       hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
        if (!hcd) {
                retval = -ENOMEM;
                goto err2;
@@ -199,7 +199,8 @@ static int ohci_hcd_sm501_drv_remove(struct platform_device *pdev)
        usb_put_hcd(hcd);
        dma_release_declared_memory(&pdev->dev);
        mem = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-       release_mem_region(mem->start, mem->end - mem->start + 1);
+       if (mem)
+               release_mem_region(mem->start, mem->end - mem->start + 1);
 
        /* mask interrupts and disable power */
 
@@ -224,24 +225,26 @@ static int ohci_sm501_suspend(struct platform_device *pdev, pm_message_t msg)
 
        sm501_unit_power(dev->parent, SM501_GATE_USB_HOST, 0);
        ohci_to_hcd(ohci)->state = HC_STATE_SUSPENDED;
-       dev->power.power_state = PMSG_SUSPEND;
        return 0;
 }
 
 static int ohci_sm501_resume(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
-       struct ohci_hcd *ohci = hcd_to_ohci(platform_get_drvdata(pdev));
+       struct usb_hcd  *hcd = platform_get_drvdata(pdev);
+       struct ohci_hcd *ohci = hcd_to_ohci(hcd);
 
        if (time_before(jiffies, ohci->next_statechange))
                msleep(5);
        ohci->next_statechange = jiffies;
 
        sm501_unit_power(dev->parent, SM501_GATE_USB_HOST, 1);
-       dev->power.power_state = PMSG_ON;
-       usb_hcd_resume_root_hub(platform_get_drvdata(pdev));
+       ohci_finish_controller_resume(hcd);
        return 0;
 }
+#else
+#define ohci_sm501_suspend NULL
+#define ohci_sm501_resume NULL
 #endif
 
 /*-------------------------------------------------------------------------*/
@@ -253,10 +256,8 @@ static struct platform_driver ohci_hcd_sm501_driver = {
        .probe          = ohci_hcd_sm501_drv_probe,
        .remove         = ohci_hcd_sm501_drv_remove,
        .shutdown       = usb_hcd_platform_shutdown,
-#ifdef CONFIG_PM
        .suspend        = ohci_sm501_suspend,
        .resume         = ohci_sm501_resume,
-#endif
        .driver         = {
                .owner  = THIS_MODULE,
                .name   = "sm501-usb",