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 77204f001b9a6eefcce60ee54b241aa364013f38..21b164e4abebf8bc71d12611b4356bb97e038718 100644 (file)
--- a/drivers/usb/host/ohci-sm501.c
+++ b/drivers/usb/host/ohci-sm501.c
@@ -75,6 +75,7 @@ static const struct hc_driver ohci_sm501_hc_driver = {
         */
        .hub_status_data =      ohci_hub_status_data,
        .hub_control =          ohci_hub_control,
+       .hub_irq_enable =       ohci_rhsc_enable,
 #ifdef CONFIG_PM
        .bus_suspend =          ohci_bus_suspend,
        .bus_resume =           ohci_bus_resume,
@@ -90,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)
@@ -142,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;