Skip to content

Commit

Permalink
[ARM] amba drivers: don't pass a consumer clock name for devices with…
Browse files Browse the repository at this point in the history
… unique clocks

Where devices only have one consumer, passing a consumer clock ID
has no real benefit, and it only encourages wrong implementations of
the clk API.  Remove it.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King authored and Russell King committed Nov 30, 2008
1 parent 80a5931 commit ee569c4
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion drivers/mmc/host/mmci.c
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ static int mmci_probe(struct amba_device *dev, void *id)
}

host = mmc_priv(mmc);
host->clk = clk_get(&dev->dev, "MCLK");
host->clk = clk_get(&dev->dev, NULL);
if (IS_ERR(host->clk)) {
ret = PTR_ERR(host->clk);
host->clk = NULL;
Expand Down
2 changes: 1 addition & 1 deletion drivers/serial/amba-pl010.c
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,7 @@ static int pl010_probe(struct amba_device *dev, void *id)
goto free;
}

uap->clk = clk_get(&dev->dev, "UARTCLK");
uap->clk = clk_get(&dev->dev, NULL);
if (IS_ERR(uap->clk)) {
ret = PTR_ERR(uap->clk);
goto unmap;
Expand Down
2 changes: 1 addition & 1 deletion drivers/serial/amba-pl011.c
Original file line number Diff line number Diff line change
Expand Up @@ -756,7 +756,7 @@ static int pl011_probe(struct amba_device *dev, void *id)
goto free;
}

uap->clk = clk_get(&dev->dev, "UARTCLK");
uap->clk = clk_get(&dev->dev, NULL);
if (IS_ERR(uap->clk)) {
ret = PTR_ERR(uap->clk);
goto unmap;
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/amba-clcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ static int clcdfb_register(struct clcd_fb *fb)
{
int ret;

fb->clk = clk_get(&fb->dev->dev, "CLCDCLK");
fb->clk = clk_get(&fb->dev->dev, NULL);
if (IS_ERR(fb->clk)) {
ret = PTR_ERR(fb->clk);
goto out;
Expand Down

0 comments on commit ee569c4

Please sign in to comment.