Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc7a3252 authored by Boris Brezillon's avatar Boris Brezillon Committed by Greg Kroah-Hartman
Browse files

usb: ohci-at91: use device managed clk retrieval 



Replace clk_get calls by devm_clk_get calls.

Signed-off-by: default avatarBoris BREZILLON <b.brezillon@overkiz.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5b218a07

drivers/usb/host/ohci-at91.c

+7 −23
Original line number Diff line number Diff line
@@ -160,30 +160,30 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver, 
		goto err;

	}



	iclk = clk_get(dev, "ohci_clk");

	iclk = devm_clk_get(dev, "ohci_clk");

	if (IS_ERR(iclk)) {

		dev_err(dev, "failed to get ohci_clk\n");

		retval = PTR_ERR(iclk);

		goto err;

	}

	fclk = clk_get(dev, "uhpck");

	fclk = devm_clk_get(dev, "uhpck");

	if (IS_ERR(fclk)) {

		dev_err(dev, "failed to get uhpck\n");

		retval = PTR_ERR(fclk);

		goto err4;

		goto err;

	}

	hclk = clk_get(dev, "hclk");

	hclk = devm_clk_get(dev, "hclk");

	if (IS_ERR(hclk)) {

		dev_err(dev, "failed to get hclk\n");

		retval = PTR_ERR(hclk);

		goto err5;

		goto err;

	}

	if (IS_ENABLED(CONFIG_COMMON_CLK)) {

		uclk = clk_get(dev, "usb_clk");

		uclk = devm_clk_get(dev, "usb_clk");

		if (IS_ERR(uclk)) {

			dev_err(dev, "failed to get uclk\n");

			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 */

	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:

	usb_put_hcd(hcd);

	return retval;
@@ -234,13 +225,6 @@ static void usb_hcd_at91_remove(struct usb_hcd *hcd, 
	usb_remove_hcd(hcd);

	at91_stop_hc(pdev);

	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;

}



/*-------------------------------------------------------------------------*/