|
@@ -160,30 +160,30 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
|
|
goto err;
|
|
goto err;
|
|
}
|
|
}
|
|
|
|
|
|
- iclk = clk_get(dev, "ohci_clk");
|
|
|
|
|
|
+ iclk = devm_clk_get(dev, "ohci_clk");
|
|
if (IS_ERR(iclk)) {
|
|
if (IS_ERR(iclk)) {
|
|
dev_err(dev, "failed to get ohci_clk\n");
|
|
dev_err(dev, "failed to get ohci_clk\n");
|
|
retval = PTR_ERR(iclk);
|
|
retval = PTR_ERR(iclk);
|
|
goto err;
|
|
goto err;
|
|
}
|
|
}
|
|
- fclk = clk_get(dev, "uhpck");
|
|
|
|
|
|
+ fclk = devm_clk_get(dev, "uhpck");
|
|
if (IS_ERR(fclk)) {
|
|
if (IS_ERR(fclk)) {
|
|
dev_err(dev, "failed to get uhpck\n");
|
|
dev_err(dev, "failed to get uhpck\n");
|
|
retval = PTR_ERR(fclk);
|
|
retval = PTR_ERR(fclk);
|
|
- goto err4;
|
|
|
|
|
|
+ goto err;
|
|
}
|
|
}
|
|
- hclk = clk_get(dev, "hclk");
|
|
|
|
|
|
+ hclk = devm_clk_get(dev, "hclk");
|
|
if (IS_ERR(hclk)) {
|
|
if (IS_ERR(hclk)) {
|
|
dev_err(dev, "failed to get hclk\n");
|
|
dev_err(dev, "failed to get hclk\n");
|
|
retval = PTR_ERR(hclk);
|
|
retval = PTR_ERR(hclk);
|
|
- goto err5;
|
|
|
|
|
|
+ goto err;
|
|
}
|
|
}
|
|
if (IS_ENABLED(CONFIG_COMMON_CLK)) {
|
|
if (IS_ENABLED(CONFIG_COMMON_CLK)) {
|
|
- uclk = clk_get(dev, "usb_clk");
|
|
|
|
|
|
+ uclk = devm_clk_get(dev, "usb_clk");
|
|
if (IS_ERR(uclk)) {
|
|
if (IS_ERR(uclk)) {
|
|
dev_err(dev, "failed to get uclk\n");
|
|
dev_err(dev, "failed to get uclk\n");
|
|
retval = PTR_ERR(uclk);
|
|
retval = PTR_ERR(uclk);
|
|
- goto err6;
|
|
|
|
|
|
+ goto err;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -201,15 +201,6 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
|
|
/* Error handling */
|
|
/* Error handling */
|
|
at91_stop_hc(pdev);
|
|
at91_stop_hc(pdev);
|
|
|
|
|
|
- if (IS_ENABLED(CONFIG_COMMON_CLK))
|
|
|
|
- clk_put(uclk);
|
|
|
|
- err6:
|
|
|
|
- clk_put(hclk);
|
|
|
|
- err5:
|
|
|
|
- clk_put(fclk);
|
|
|
|
- err4:
|
|
|
|
- clk_put(iclk);
|
|
|
|
-
|
|
|
|
err:
|
|
err:
|
|
usb_put_hcd(hcd);
|
|
usb_put_hcd(hcd);
|
|
return retval;
|
|
return retval;
|
|
@@ -234,13 +225,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);
|
|
usb_put_hcd(hcd);
|
|
usb_put_hcd(hcd);
|
|
-
|
|
|
|
- if (IS_ENABLED(CONFIG_COMMON_CLK))
|
|
|
|
- clk_put(uclk);
|
|
|
|
- clk_put(hclk);
|
|
|
|
- clk_put(fclk);
|
|
|
|
- clk_put(iclk);
|
|
|
|
- fclk = iclk = hclk = NULL;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
/*-------------------------------------------------------------------------*/
|