Commit 9c7174db authored by Andi Shyti's avatar Andi Shyti Committed by Wolfram Sang
Browse files

i2c: nomadik: Use devm_clk_get_enabled() 



Replace the pair of functions, devm_clk_get() and
clk_prepare_enable(), with a single function
devm_clk_get_enabled().

Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 1c5d33ff

drivers/i2c/busses/i2c-nomadik.c

+3 −15
Original line number Diff line number Diff line
@@ -1005,18 +1005,12 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id) 
		return ret;

	}



	dev->clk = devm_clk_get(&adev->dev, NULL);

	dev->clk = devm_clk_get_enabled(&adev->dev, NULL);

	if (IS_ERR(dev->clk)) {

		dev_err(&adev->dev, "could not get i2c clock\n");

		dev_err(&adev->dev, "could enable i2c clock\n");

		return PTR_ERR(dev->clk);

	}



	ret = clk_prepare_enable(dev->clk);

	if (ret) {

		dev_err(&adev->dev, "can't prepare_enable clock\n");

		return ret;

	}



	init_hw(dev);



	adap = &dev->adap;
@@ -1037,16 +1031,11 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id) 


	ret = i2c_add_adapter(adap);

	if (ret)

		goto err_no_adap;

		return ret;



	pm_runtime_put(&adev->dev);



	return 0;



 err_no_adap:

	clk_disable_unprepare(dev->clk);



	return ret;

}



static void nmk_i2c_remove(struct amba_device *adev)
@@ -1060,7 +1049,6 @@ static void nmk_i2c_remove(struct amba_device *adev) 
	clear_all_interrupts(dev);

	/* disable the controller */

	i2c_clr_bit(dev->virtbase + I2C_CR, I2C_CR_PE);

	clk_disable_unprepare(dev->clk);

	release_mem_region(res->start, resource_size(res));

}