Commit b7e159c2 authored by Chao Xie's avatar Chao Xie Committed by Felipe Balbi

usb: ehci: mv_ehci: remove unused clock

The origianl understanding of clock is wrong. The EHCI controller
only have one clock input.
Passing clock name by pdata is wrong. The clock is defined by device
iteself.
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarChao Xie <chao.xie@marvell.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent df18feda
...@@ -33,25 +33,17 @@ struct ehci_hcd_mv { ...@@ -33,25 +33,17 @@ struct ehci_hcd_mv {
struct mv_usb_platform_data *pdata; struct mv_usb_platform_data *pdata;
/* clock source and total clock number */ struct clk *clk;
unsigned int clknum;
struct clk *clk[0];
}; };
static void ehci_clock_enable(struct ehci_hcd_mv *ehci_mv) static void ehci_clock_enable(struct ehci_hcd_mv *ehci_mv)
{ {
unsigned int i; clk_prepare_enable(ehci_mv->clk);
for (i = 0; i < ehci_mv->clknum; i++)
clk_prepare_enable(ehci_mv->clk[i]);
} }
static void ehci_clock_disable(struct ehci_hcd_mv *ehci_mv) static void ehci_clock_disable(struct ehci_hcd_mv *ehci_mv)
{ {
unsigned int i; clk_disable_unprepare(ehci_mv->clk);
for (i = 0; i < ehci_mv->clknum; i++)
clk_disable_unprepare(ehci_mv->clk[i]);
} }
static int mv_ehci_enable(struct ehci_hcd_mv *ehci_mv) static int mv_ehci_enable(struct ehci_hcd_mv *ehci_mv)
...@@ -144,9 +136,8 @@ static int mv_ehci_probe(struct platform_device *pdev) ...@@ -144,9 +136,8 @@ static int mv_ehci_probe(struct platform_device *pdev)
struct ehci_hcd *ehci; struct ehci_hcd *ehci;
struct ehci_hcd_mv *ehci_mv; struct ehci_hcd_mv *ehci_mv;
struct resource *r; struct resource *r;
int clk_i, retval = -ENODEV; int retval = -ENODEV;
u32 offset; u32 offset;
size_t size;
if (!pdata) { if (!pdata) {
dev_err(&pdev->dev, "missing platform_data\n"); dev_err(&pdev->dev, "missing platform_data\n");
...@@ -160,8 +151,7 @@ static int mv_ehci_probe(struct platform_device *pdev) ...@@ -160,8 +151,7 @@ static int mv_ehci_probe(struct platform_device *pdev)
if (!hcd) if (!hcd)
return -ENOMEM; return -ENOMEM;
size = sizeof(*ehci_mv) + sizeof(struct clk *) * pdata->clknum; ehci_mv = devm_kzalloc(&pdev->dev, sizeof(*ehci_mv), GFP_KERNEL);
ehci_mv = devm_kzalloc(&pdev->dev, size, GFP_KERNEL);
if (ehci_mv == NULL) { if (ehci_mv == NULL) {
dev_err(&pdev->dev, "cannot allocate ehci_hcd_mv\n"); dev_err(&pdev->dev, "cannot allocate ehci_hcd_mv\n");
retval = -ENOMEM; retval = -ENOMEM;
...@@ -172,16 +162,11 @@ static int mv_ehci_probe(struct platform_device *pdev) ...@@ -172,16 +162,11 @@ static int mv_ehci_probe(struct platform_device *pdev)
ehci_mv->pdata = pdata; ehci_mv->pdata = pdata;
ehci_mv->hcd = hcd; ehci_mv->hcd = hcd;
ehci_mv->clknum = pdata->clknum; ehci_mv->clk = devm_clk_get(&pdev->dev, NULL);
for (clk_i = 0; clk_i < ehci_mv->clknum; clk_i++) { if (IS_ERR(ehci_mv->clk)) {
ehci_mv->clk[clk_i] = dev_err(&pdev->dev, "error getting clock\n");
devm_clk_get(&pdev->dev, pdata->clkname[clk_i]); retval = PTR_ERR(ehci_mv->clk);
if (IS_ERR(ehci_mv->clk[clk_i])) { goto err_clear_drvdata;
dev_err(&pdev->dev, "error get clck \"%s\"\n",
pdata->clkname[clk_i]);
retval = PTR_ERR(ehci_mv->clk[clk_i]);
goto err_clear_drvdata;
}
} }
r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phyregs"); r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phyregs");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment