diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/host/mmci.c | 2 | ||||
| -rw-r--r-- | drivers/serial/amba-pl010.c | 2 | ||||
| -rw-r--r-- | drivers/serial/amba-pl011.c | 2 | ||||
| -rw-r--r-- | drivers/video/amba-clcd.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 2fadf323c696..1bcbdd6763ac 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c | |||
| @@ -500,7 +500,7 @@ static int mmci_probe(struct amba_device *dev, void *id) | |||
| 500 | } | 500 | } |
| 501 | 501 | ||
| 502 | host = mmc_priv(mmc); | 502 | host = mmc_priv(mmc); |
| 503 | host->clk = clk_get(&dev->dev, "MCLK"); | 503 | host->clk = clk_get(&dev->dev, NULL); |
| 504 | if (IS_ERR(host->clk)) { | 504 | if (IS_ERR(host->clk)) { |
| 505 | ret = PTR_ERR(host->clk); | 505 | ret = PTR_ERR(host->clk); |
| 506 | host->clk = NULL; | 506 | host->clk = NULL; |
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c index 71562689116f..e3a5ad5ef1d6 100644 --- a/drivers/serial/amba-pl010.c +++ b/drivers/serial/amba-pl010.c | |||
| @@ -692,7 +692,7 @@ static int pl010_probe(struct amba_device *dev, void *id) | |||
| 692 | goto free; | 692 | goto free; |
| 693 | } | 693 | } |
| 694 | 694 | ||
| 695 | uap->clk = clk_get(&dev->dev, "UARTCLK"); | 695 | uap->clk = clk_get(&dev->dev, NULL); |
| 696 | if (IS_ERR(uap->clk)) { | 696 | if (IS_ERR(uap->clk)) { |
| 697 | ret = PTR_ERR(uap->clk); | 697 | ret = PTR_ERR(uap->clk); |
| 698 | goto unmap; | 698 | goto unmap; |
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c index b7180046f8db..8b2b9700f3e4 100644 --- a/drivers/serial/amba-pl011.c +++ b/drivers/serial/amba-pl011.c | |||
| @@ -756,7 +756,7 @@ static int pl011_probe(struct amba_device *dev, void *id) | |||
| 756 | goto free; | 756 | goto free; |
| 757 | } | 757 | } |
| 758 | 758 | ||
| 759 | uap->clk = clk_get(&dev->dev, "UARTCLK"); | 759 | uap->clk = clk_get(&dev->dev, NULL); |
| 760 | if (IS_ERR(uap->clk)) { | 760 | if (IS_ERR(uap->clk)) { |
| 761 | ret = PTR_ERR(uap->clk); | 761 | ret = PTR_ERR(uap->clk); |
| 762 | goto unmap; | 762 | goto unmap; |
diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c index 70ba1bd845fb..2ac52fd8cc11 100644 --- a/drivers/video/amba-clcd.c +++ b/drivers/video/amba-clcd.c | |||
| @@ -343,7 +343,7 @@ static int clcdfb_register(struct clcd_fb *fb) | |||
| 343 | { | 343 | { |
| 344 | int ret; | 344 | int ret; |
| 345 | 345 | ||
| 346 | fb->clk = clk_get(&fb->dev->dev, "CLCDCLK"); | 346 | fb->clk = clk_get(&fb->dev->dev, NULL); |
| 347 | if (IS_ERR(fb->clk)) { | 347 | if (IS_ERR(fb->clk)) { |
| 348 | ret = PTR_ERR(fb->clk); | 348 | ret = PTR_ERR(fb->clk); |
| 349 | goto out; | 349 | goto out; |
