Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee569c43 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 80a5931b

drivers/mmc/host/mmci.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/serial/amba-pl010.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/serial/amba-pl011.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/video/amba-clcd.c

+1 −1
Original line number Diff line number Diff line
@@ -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;