Skip to content

Commit f956c4d

Browse files
committed
USB: ohci-sh.c: remove err() usage
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>
1 parent 1041ac1 commit f956c4d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/usb/host/ohci-sh.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,20 +88,20 @@ static int ohci_hcd_sh_probe(struct platform_device *pdev)
8888

8989
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
9090
if (!res) {
91-
err("platform_get_resource error.");
91+
dev_err(&pdev->dev, "platform_get_resource error.\n");
9292
return -ENODEV;
9393
}
9494

9595
irq = platform_get_irq(pdev, 0);
9696
if (irq < 0) {
97-
err("platform_get_irq error.");
97+
dev_err(&pdev->dev, "platform_get_irq error.\n");
9898
return -ENODEV;
9999
}
100100

101101
/* initialize hcd */
102102
hcd = usb_create_hcd(&ohci_sh_hc_driver, &pdev->dev, (char *)hcd_name);
103103
if (!hcd) {
104-
err("Failed to create hcd");
104+
dev_err(&pdev->dev, "Failed to create hcd\n");
105105
return -ENOMEM;
106106
}
107107

@@ -110,7 +110,7 @@ static int ohci_hcd_sh_probe(struct platform_device *pdev)
110110
hcd->rsrc_len = resource_size(res);
111111
ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
112112
if (ret != 0) {
113-
err("Failed to add hcd");
113+
dev_err(&pdev->dev, "Failed to add hcd\n");
114114
usb_put_hcd(hcd);
115115
return ret;
116116
}

0 commit comments

Comments
 (0)