summaryrefslogtreecommitdiff
path: root/drivers/usb/host/ohci-spear.c
diff options
context:
space:
mode:
authorAmardeep Rai <amardeep.rai-ext@st.com>2012-11-08 19:07:58 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-15 00:15:20 +0400
commitd8fd7d5ae3e0561920b38647793b1947e07c7acf (patch)
tree0516dd9424ebfa62eddcce59683388e0b279e059 /drivers/usb/host/ohci-spear.c
parentbc13364b3413a3815740c4a2f087e06f1b7ed850 (diff)
downloadlinux-d8fd7d5ae3e0561920b38647793b1947e07c7acf.tar.xz
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: Amardeep Rai <amardeep.rai-ext@st.com> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/ohci-spear.c')
-rw-r--r--drivers/usb/host/ohci-spear.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/usb/host/ohci-spear.c b/drivers/usb/host/ohci-spear.c
index d607be33c03c..974770833653 100644
--- a/drivers/usb/host/ohci-spear.c
+++ b/drivers/usb/host/ohci-spear.c
@@ -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);