[ARM] amba drivers: don't pass a consumer clock name for devices with unique clocks
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 30 Nov 2008 17:38:14 +0000 (17:38 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 30 Nov 2008 17:38:14 +0000 (17:38 +0000)
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>
drivers/mmc/host/mmci.c
drivers/serial/amba-pl010.c
drivers/serial/amba-pl011.c
drivers/video/amba-clcd.c

index 2fadf323c696d381f1fe23fb062e108c1e97a59f..1bcbdd6763ace8d1dc3a91db7a5b1d0c76a67b63 100644 (file)
@@ -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;
index 71562689116ff4e45f326dbfc6e8cbb10732ad31..e3a5ad5ef1d6003a70ac2c98e87b325d73b1ab79 100644 (file)
@@ -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;
index b7180046f8dba082f02767e07775fae72aafc53d..8b2b9700f3e4cecb108b5da816cb777c3424ba6c 100644 (file)
@@ -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;
index a7a1c891bfa2e0646a1e73757f47de70e017b77a..c818174b40d16fa6f5f6813cdd45b5bb1d9dd902 100644 (file)
@@ -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;