]> Pileus Git - ~andy/linux/commitdiff
USB: ohci-sh.c: remove err() usage
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Apr 2012 18:24:44 +0000 (11:24 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Apr 2012 18:24:44 +0000 (11:24 -0700)
err() was a very old USB-specific macro that I thought had
gone away.  This patch removes it from being used in the
driver and uses dev_err() instead.

CC: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/ohci-sh.c

index 84686d90805bb6aa4624ab3858eeb3c9a325dc8a..76a20c278362ad583c29d3bb8cfe5e68073f152e 100644 (file)
@@ -88,20 +88,20 @@ static int ohci_hcd_sh_probe(struct platform_device *pdev)
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!res) {
-               err("platform_get_resource error.");
+               dev_err(&pdev->dev, "platform_get_resource error.\n");
                return -ENODEV;
        }
 
        irq = platform_get_irq(pdev, 0);
        if (irq < 0) {
-               err("platform_get_irq error.");
+               dev_err(&pdev->dev, "platform_get_irq error.\n");
                return -ENODEV;
        }
 
        /* initialize hcd */
        hcd = usb_create_hcd(&ohci_sh_hc_driver, &pdev->dev, (char *)hcd_name);
        if (!hcd) {
-               err("Failed to create hcd");
+               dev_err(&pdev->dev, "Failed to create hcd\n");
                return -ENOMEM;
        }
 
@@ -110,7 +110,7 @@ static int ohci_hcd_sh_probe(struct platform_device *pdev)
        hcd->rsrc_len = resource_size(res);
        ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
        if (ret != 0) {
-               err("Failed to add hcd");
+               dev_err(&pdev->dev, "Failed to add hcd\n");
                usb_put_hcd(hcd);
                return ret;
        }