|
@@ -154,24 +154,17 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
|
|
hcd->rsrc_start = pdev->resource[0].start;
|
|
hcd->rsrc_start = pdev->resource[0].start;
|
|
hcd->rsrc_len = resource_size(&pdev->resource[0]);
|
|
hcd->rsrc_len = resource_size(&pdev->resource[0]);
|
|
|
|
|
|
- if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
|
|
|
|
- pr_debug("request_mem_region failed\n");
|
|
|
|
- retval = -EBUSY;
|
|
|
|
- goto err1;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
|
|
|
|
- if (!hcd->regs) {
|
|
|
|
- pr_debug("ioremap failed\n");
|
|
|
|
- retval = -EIO;
|
|
|
|
- goto err2;
|
|
|
|
|
|
+ hcd->regs = devm_ioremap_resource(dev, res);
|
|
|
|
+ if (IS_ERR(hcd->regs)) {
|
|
|
|
+ retval = PTR_ERR(hcd->regs);
|
|
|
|
+ goto err;
|
|
}
|
|
}
|
|
|
|
|
|
iclk = clk_get(&pdev->dev, "ohci_clk");
|
|
iclk = clk_get(&pdev->dev, "ohci_clk");
|
|
if (IS_ERR(iclk)) {
|
|
if (IS_ERR(iclk)) {
|
|
dev_err(&pdev->dev, "failed to get ohci_clk\n");
|
|
dev_err(&pdev->dev, "failed to get ohci_clk\n");
|
|
retval = PTR_ERR(iclk);
|
|
retval = PTR_ERR(iclk);
|
|
- goto err3;
|
|
|
|
|
|
+ goto err;
|
|
}
|
|
}
|
|
fclk = clk_get(&pdev->dev, "uhpck");
|
|
fclk = clk_get(&pdev->dev, "uhpck");
|
|
if (IS_ERR(fclk)) {
|
|
if (IS_ERR(fclk)) {
|
|
@@ -217,13 +210,7 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
|
|
err4:
|
|
err4:
|
|
clk_put(iclk);
|
|
clk_put(iclk);
|
|
|
|
|
|
- err3:
|
|
|
|
- iounmap(hcd->regs);
|
|
|
|
-
|
|
|
|
- err2:
|
|
|
|
- release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
|
|
|
|
-
|
|
|
|
- err1:
|
|
|
|
|
|
+ err:
|
|
usb_put_hcd(hcd);
|
|
usb_put_hcd(hcd);
|
|
return retval;
|
|
return retval;
|
|
}
|
|
}
|
|
@@ -246,8 +233,6 @@ static void usb_hcd_at91_remove(struct usb_hcd *hcd,
|
|
{
|
|
{
|
|
usb_remove_hcd(hcd);
|
|
usb_remove_hcd(hcd);
|
|
at91_stop_hc(pdev);
|
|
at91_stop_hc(pdev);
|
|
- iounmap(hcd->regs);
|
|
|
|
- release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
|
|
|
|
usb_put_hcd(hcd);
|
|
usb_put_hcd(hcd);
|
|
|
|
|
|
if (IS_ENABLED(CONFIG_COMMON_CLK))
|
|
if (IS_ENABLED(CONFIG_COMMON_CLK))
|