Skip to content

Commit

Permalink
usb: ehci: mv_ehci: remove unused clock
Browse files Browse the repository at this point in the history
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: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Chao Xie <chao.xie@marvell.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
  • Loading branch information
Chao Xie authored and Felipe Balbi committed Apr 2, 2013
1 parent df18fed commit b7e159c
Showing 1 changed file with 10 additions and 25 deletions.
35 changes: 10 additions & 25 deletions drivers/usb/host/ehci-mv.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,25 +33,17 @@ struct ehci_hcd_mv {

struct mv_usb_platform_data *pdata;

/* clock source and total clock number */
unsigned int clknum;
struct clk *clk[0];
struct clk *clk;
};

static void ehci_clock_enable(struct ehci_hcd_mv *ehci_mv)
{
unsigned int i;

for (i = 0; i < ehci_mv->clknum; i++)
clk_prepare_enable(ehci_mv->clk[i]);
clk_prepare_enable(ehci_mv->clk);
}

static void ehci_clock_disable(struct ehci_hcd_mv *ehci_mv)
{
unsigned int i;

for (i = 0; i < ehci_mv->clknum; i++)
clk_disable_unprepare(ehci_mv->clk[i]);
clk_disable_unprepare(ehci_mv->clk);
}

static int mv_ehci_enable(struct ehci_hcd_mv *ehci_mv)
Expand Down Expand Up @@ -144,9 +136,8 @@ static int mv_ehci_probe(struct platform_device *pdev)
struct ehci_hcd *ehci;
struct ehci_hcd_mv *ehci_mv;
struct resource *r;
int clk_i, retval = -ENODEV;
int retval = -ENODEV;
u32 offset;
size_t size;

if (!pdata) {
dev_err(&pdev->dev, "missing platform_data\n");
Expand All @@ -160,8 +151,7 @@ static int mv_ehci_probe(struct platform_device *pdev)
if (!hcd)
return -ENOMEM;

size = sizeof(*ehci_mv) + sizeof(struct clk *) * pdata->clknum;
ehci_mv = devm_kzalloc(&pdev->dev, size, GFP_KERNEL);
ehci_mv = devm_kzalloc(&pdev->dev, sizeof(*ehci_mv), GFP_KERNEL);
if (ehci_mv == NULL) {
dev_err(&pdev->dev, "cannot allocate ehci_hcd_mv\n");
retval = -ENOMEM;
Expand All @@ -172,16 +162,11 @@ static int mv_ehci_probe(struct platform_device *pdev)
ehci_mv->pdata = pdata;
ehci_mv->hcd = hcd;

ehci_mv->clknum = pdata->clknum;
for (clk_i = 0; clk_i < ehci_mv->clknum; clk_i++) {
ehci_mv->clk[clk_i] =
devm_clk_get(&pdev->dev, pdata->clkname[clk_i]);
if (IS_ERR(ehci_mv->clk[clk_i])) {
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;
}
ehci_mv->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(ehci_mv->clk)) {
dev_err(&pdev->dev, "error getting clock\n");
retval = PTR_ERR(ehci_mv->clk);
goto err_clear_drvdata;
}

r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phyregs");
Expand Down

0 comments on commit b7e159c

Please sign in to comment.