Skip to content

Commit

Permalink
usb: otg: mv_otg: remove unused clock
Browse files Browse the repository at this point in the history
The origianl understanding of clock is wrong. The OTG controller
only have one clock input.
Passing clock name by pdata is wrong. The clock is defined by device
iteself.

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 1919811 commit df18fed
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 23 deletions.
28 changes: 7 additions & 21 deletions drivers/usb/phy/phy-mv-usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -237,18 +237,12 @@ static void mv_otg_start_periphrals(struct mv_otg *mvotg, int on)

static void otg_clock_enable(struct mv_otg *mvotg)
{
unsigned int i;

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

static void otg_clock_disable(struct mv_otg *mvotg)
{
unsigned int i;

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

static int mv_otg_enable_internal(struct mv_otg *mvotg)
Expand Down Expand Up @@ -684,16 +678,14 @@ static int mv_otg_probe(struct platform_device *pdev)
struct mv_otg *mvotg;
struct usb_otg *otg;
struct resource *r;
int retval = 0, clk_i, i;
size_t size;
int retval = 0, i;

if (pdata == NULL) {
dev_err(&pdev->dev, "failed to get platform data\n");
return -ENODEV;
}

size = sizeof(*mvotg) + sizeof(struct clk *) * pdata->clknum;
mvotg = devm_kzalloc(&pdev->dev, size, GFP_KERNEL);
mvotg = devm_kzalloc(&pdev->dev, sizeof(*mvotg), GFP_KERNEL);
if (!mvotg) {
dev_err(&pdev->dev, "failed to allocate memory!\n");
return -ENOMEM;
Expand All @@ -708,15 +700,9 @@ static int mv_otg_probe(struct platform_device *pdev)
mvotg->pdev = pdev;
mvotg->pdata = pdata;

mvotg->clknum = pdata->clknum;
for (clk_i = 0; clk_i < mvotg->clknum; clk_i++) {
mvotg->clk[clk_i] = devm_clk_get(&pdev->dev,
pdata->clkname[clk_i]);
if (IS_ERR(mvotg->clk[clk_i])) {
retval = PTR_ERR(mvotg->clk[clk_i]);
return retval;
}
}
mvotg->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(mvotg->clk))
return PTR_ERR(mvotg->clk);

mvotg->qwork = create_singlethread_workqueue("mv_otg_queue");
if (!mvotg->qwork) {
Expand Down
3 changes: 1 addition & 2 deletions drivers/usb/phy/phy-mv-usb.h
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,7 @@ struct mv_otg {

unsigned int active;
unsigned int clock_gating;
unsigned int clknum;
struct clk *clk[0];
struct clk *clk;
};

#endif

0 comments on commit df18fed

Please sign in to comment.