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

Commit d16933b3 authored by Tushar Behera's avatar Tushar Behera Committed by Wolfram Sang
Browse files

i2c: s3c2410: Move location of clk_prepare_enable() call in probe function 



In i2c-s3c2410 driver probe, only s3c24xx_i2c_init() needs the I2C clock
to be enabled. Moving clk_prepare_enable() and clk_disable_unprepare()
calls to around this function simplifies the return path of probe call.

Signed-off-by: default avatarTushar Behera <tushar.behera@linaro.org>
Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
parent 2b255b94

drivers/i2c/busses/i2c-s3c2410.c

+12 −17
Original line number Diff line number Diff line
@@ -1030,23 +1030,20 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev) 


	dev_dbg(&pdev->dev, "clock source %p\n", i2c->clk);



	clk_prepare_enable(i2c->clk);



	/* map the registers */



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (res == NULL) {

		dev_err(&pdev->dev, "cannot find IO resource\n");

		ret = -ENOENT;

		goto err_clk;

		return -ENOENT;

	}



	i2c->regs = devm_request_and_ioremap(&pdev->dev, res);



	if (i2c->regs == NULL) {

		dev_err(&pdev->dev, "cannot request and map IO\n");

		ret = -ENXIO;

		goto err_clk;

		return -ENXIO;

	}



	dev_dbg(&pdev->dev, "registers %p (%p)\n",
@@ -1064,16 +1061,18 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev) 
	if (i2c->pdata->cfg_gpio) {

		i2c->pdata->cfg_gpio(to_platform_device(i2c->dev));

	} else if (IS_ERR(i2c->pctrl) && s3c24xx_i2c_parse_dt_gpio(i2c)) {

		ret = -EINVAL;

		goto err_clk;

		return -EINVAL;

	}



	/* initialise the i2c controller */



	clk_prepare_enable(i2c->clk);

	ret = s3c24xx_i2c_init(i2c);

	if (ret != 0)

		goto err_clk;



	clk_disable_unprepare(i2c->clk);

	if (ret != 0) {

		dev_err(&pdev->dev, "I2C controller init failed\n");

		return ret;

	}

	/* find the IRQ for this unit (note, this relies on the init call to

	 * ensure no current IRQs pending

	 */
@@ -1081,7 +1080,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev) 
	i2c->irq = ret = platform_get_irq(pdev, 0);

	if (ret <= 0) {

		dev_err(&pdev->dev, "cannot find IRQ\n");

		goto err_clk;

		return ret;

	}



	ret = devm_request_irq(&pdev->dev, i2c->irq, s3c24xx_i2c_irq, 0,
@@ -1089,13 +1088,13 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev) 


	if (ret != 0) {

		dev_err(&pdev->dev, "cannot claim IRQ %d\n", i2c->irq);

		goto err_clk;

		return ret;

	}



	ret = s3c24xx_i2c_register_cpufreq(i2c);

	if (ret < 0) {

		dev_err(&pdev->dev, "failed to register cpufreq notifier\n");

		goto err_clk;

		return ret;

	}



	/* Note, previous versions of the driver used i2c_add_adapter()
@@ -1120,14 +1119,10 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev) 
	pm_runtime_enable(&i2c->adap.dev);



	dev_info(&pdev->dev, "%s: S3C I2C adapter\n", dev_name(&i2c->adap.dev));

	clk_disable_unprepare(i2c->clk);

	return 0;



 err_cpufreq:

	s3c24xx_i2c_deregister_cpufreq(i2c);



 err_clk:

	clk_disable_unprepare(i2c->clk);

	return ret;

}