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

Commit d8fd7d5a authored by Amardeep Rai's avatar Amardeep Rai Committed by Greg Kroah-Hartman
Browse files

usb: spear-ehci/ohci: Do clk_get using dev-id 



We used to get clk using con-id, but now we have device struct available for
these devices as they are probed using DT. And so must get clk using dev-id.

Signed-off-by: default avatarAmardeep Rai <amardeep.rai-ext@st.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bc13364b

drivers/usb/host/ehci-spear.c

+1 −12
Original line number Diff line number Diff line
@@ -109,8 +109,6 @@ static int spear_ehci_hcd_drv_probe(struct platform_device *pdev) 
	struct clk *usbh_clk;

	const struct hc_driver *driver = &ehci_spear_hc_driver;

	int irq, retval;

	char clk_name[20] = "usbh_clk";

	static int instance = -1;



	if (usb_disabled())

		return -ENODEV;
@@ -129,16 +127,7 @@ static int spear_ehci_hcd_drv_probe(struct platform_device *pdev) 
	if (!pdev->dev.dma_mask)

		pdev->dev.dma_mask = &spear_ehci_dma_mask;



	/*

	 * Increment the device instance, when probing via device-tree

	 */

	if (pdev->id < 0)

		instance++;

	else

		instance = pdev->id;

	sprintf(clk_name, "usbh.%01d_clk", instance);



	usbh_clk = clk_get(NULL, clk_name);

	usbh_clk = clk_get(&pdev->dev, NULL);

	if (IS_ERR(usbh_clk)) {

		dev_err(&pdev->dev, "Error getting interface clock\n");

		retval = PTR_ERR(usbh_clk);

drivers/usb/host/ohci-spear.c

+1 −12
Original line number Diff line number Diff line
@@ -101,8 +101,6 @@ static int spear_ohci_hcd_drv_probe(struct platform_device *pdev) 
	struct spear_ohci *ohci_p;

	struct resource *res;

	int retval, irq;

	char clk_name[20] = "usbh_clk";

	static int instance = -1;



	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {
@@ -118,16 +116,7 @@ static int spear_ohci_hcd_drv_probe(struct platform_device *pdev) 
	if (!pdev->dev.dma_mask)

		pdev->dev.dma_mask = &spear_ohci_dma_mask;



	/*

	 * Increment the device instance, when probing via device-tree

	 */

	if (pdev->id < 0)

		instance++;

	else

		instance = pdev->id;

	sprintf(clk_name, "usbh.%01d_clk", instance);



	usbh_clk = clk_get(NULL, clk_name);

	usbh_clk = clk_get(&pdev->dev, NULL);

	if (IS_ERR(usbh_clk)) {

		dev_err(&pdev->dev, "Error getting interface clock\n");

		retval = PTR_ERR(usbh_clk);