Ver código fonte

[ARM] amba drivers: don't pass a consumer clock name for devices with 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>
Russell King 16 anos atrás
pai
commit
ee569c43e3

+ 1 - 1
drivers/mmc/host/mmci.c

@@ -500,7 +500,7 @@ static int mmci_probe(struct amba_device *dev, void *id)
 	}
 	}
 
 
 	host = mmc_priv(mmc);
 	host = mmc_priv(mmc);
-	host->clk = clk_get(&dev->dev, "MCLK");
+	host->clk = clk_get(&dev->dev, NULL);
 	if (IS_ERR(host->clk)) {
 	if (IS_ERR(host->clk)) {
 		ret = PTR_ERR(host->clk);
 		ret = PTR_ERR(host->clk);
 		host->clk = NULL;
 		host->clk = NULL;

+ 1 - 1
drivers/serial/amba-pl010.c

@@ -692,7 +692,7 @@ static int pl010_probe(struct amba_device *dev, void *id)
 		goto free;
 		goto free;
 	}
 	}
 
 
-	uap->clk = clk_get(&dev->dev, "UARTCLK");
+	uap->clk = clk_get(&dev->dev, NULL);
 	if (IS_ERR(uap->clk)) {
 	if (IS_ERR(uap->clk)) {
 		ret = PTR_ERR(uap->clk);
 		ret = PTR_ERR(uap->clk);
 		goto unmap;
 		goto unmap;

+ 1 - 1
drivers/serial/amba-pl011.c

@@ -756,7 +756,7 @@ static int pl011_probe(struct amba_device *dev, void *id)
 		goto free;
 		goto free;
 	}
 	}
 
 
-	uap->clk = clk_get(&dev->dev, "UARTCLK");
+	uap->clk = clk_get(&dev->dev, NULL);
 	if (IS_ERR(uap->clk)) {
 	if (IS_ERR(uap->clk)) {
 		ret = PTR_ERR(uap->clk);
 		ret = PTR_ERR(uap->clk);
 		goto unmap;
 		goto unmap;

+ 1 - 1
drivers/video/amba-clcd.c

@@ -343,7 +343,7 @@ static int clcdfb_register(struct clcd_fb *fb)
 {
 {
 	int ret;
 	int ret;
 
 
-	fb->clk = clk_get(&fb->dev->dev, "CLCDCLK");
+	fb->clk = clk_get(&fb->dev->dev, NULL);
 	if (IS_ERR(fb->clk)) {
 	if (IS_ERR(fb->clk)) {
 		ret = PTR_ERR(fb->clk);
 		ret = PTR_ERR(fb->clk);
 		goto out;
 		goto out;