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

[ARM] pxa: 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.  Remove it.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 8c3abc7d

arch/arm/mach-pxa/pwm.c

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ static struct pwm_device *pwm_probe(struct platform_device *pdev, 
		return ERR_PTR(-ENOMEM);

	}



	pwm->clk = clk_get(&pdev->dev, "PWMCLK");

	pwm->clk = clk_get(&pdev->dev, NULL);

	if (IS_ERR(pwm->clk)) {

		ret = PTR_ERR(pwm->clk);

		goto err_free;

arch/arm/mach-pxa/ssp.c

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ static int __devinit ssp_probe(struct platform_device *pdev, int type) 
	}

	ssp->pdev = pdev;



	ssp->clk = clk_get(&pdev->dev, "SSPCLK");

	ssp->clk = clk_get(&pdev->dev, NULL);

	if (IS_ERR(ssp->clk)) {

		ret = PTR_ERR(ssp->clk);

		goto err_free;

drivers/i2c/busses/i2c-pxa.c

+1 −1
Original line number Diff line number Diff line
@@ -1016,7 +1016,7 @@ static int i2c_pxa_probe(struct platform_device *dev) 
	snprintf(i2c->adap.name, sizeof(i2c->adap.name), "pxa_i2c-i2c.%u",

		 i2c->adap.nr);



	i2c->clk = clk_get(&dev->dev, "I2CCLK");

	i2c->clk = clk_get(&dev->dev, NULL);

	if (IS_ERR(i2c->clk)) {

		ret = PTR_ERR(i2c->clk);

		goto eclk;

drivers/input/keyboard/pxa27x_keypad.c

+1 −1
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ static int __devinit pxa27x_keypad_probe(struct platform_device *pdev) 
		goto failed_free_mem;

	}



	keypad->clk = clk_get(&pdev->dev, "KBDCLK");

	keypad->clk = clk_get(&pdev->dev, NULL);

	if (IS_ERR(keypad->clk)) {

		dev_err(&pdev->dev, "failed to get keypad clock\n");

		error = PTR_ERR(keypad->clk);

drivers/media/video/pxa_camera.c

+1 −1
Original line number Diff line number Diff line
@@ -1071,7 +1071,7 @@ static int pxa_camera_probe(struct platform_device *pdev) 
		goto exit;

	}



	pcdev->clk = clk_get(&pdev->dev, "CAMCLK");

	pcdev->clk = clk_get(&pdev->dev, NULL);

	if (IS_ERR(pcdev->clk)) {

		err = PTR_ERR(pcdev->clk);

		goto exit_kfree;