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

Commit 85796843 authored by Vishwanathrao Badarkhe, Manish's avatar Vishwanathrao Badarkhe, Manish Committed by Wolfram Sang
Browse files

i2c: davinci: update to devm_* API 



Update the code to use devm_* API so that driver core will manage
resources.

Signed-off-by: default avatarVishwanathrao Badarkhe, Manish <manishv.b@ti.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent adf68acf

drivers/i2c/busses/i2c-davinci.c

+14 −34
Original line number Diff line number Diff line
@@ -643,7 +643,7 @@ static int davinci_i2c_probe(struct platform_device *pdev) 
{

	struct davinci_i2c_dev *dev;

	struct i2c_adapter *adap;

	struct resource *mem, *irq, *ioarea;

	struct resource *mem, *irq;

	int r;



	/* NOTE: driver uses the static register mapping */
@@ -659,17 +659,11 @@ static int davinci_i2c_probe(struct platform_device *pdev) 
		return -ENODEV;

	}



	ioarea = request_mem_region(mem->start, resource_size(mem),

				    pdev->name);

	if (!ioarea) {

		dev_err(&pdev->dev, "I2C region already claimed\n");

		return -EBUSY;

	}



	dev = kzalloc(sizeof(struct davinci_i2c_dev), GFP_KERNEL);

	dev = devm_kzalloc(&pdev->dev, sizeof(struct davinci_i2c_dev),

			GFP_KERNEL);

	if (!dev) {

		r = -ENOMEM;

		goto err_release_region;

		dev_err(&pdev->dev, "Memory allocation failed\n");

		return -ENOMEM;

	}



	init_completion(&dev->cmd_complete);
@@ -699,22 +693,23 @@ static int davinci_i2c_probe(struct platform_device *pdev) 
		dev->pdata = &davinci_i2c_platform_data_default;

	}



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

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

	if (IS_ERR(dev->clk)) {

		r = -ENODEV;

		goto err_free_mem;

	}

	clk_prepare_enable(dev->clk);



	dev->base = ioremap(mem->start, resource_size(mem));

	if (!dev->base) {

		r = -EBUSY;

		goto err_mem_ioremap;

	dev->base = devm_ioremap_resource(&pdev->dev, mem);

	if (IS_ERR(dev->base)) {

		r = PTR_ERR(dev->base);

		goto err_unuse_clocks;

	}



	i2c_davinci_init(dev);



	r = request_irq(dev->irq, i2c_davinci_isr, 0, pdev->name, dev);

	r = devm_request_irq(&pdev->dev, dev->irq, i2c_davinci_isr, 0,

			pdev->name, dev);

	if (r) {

		dev_err(&pdev->dev, "failure requesting irq %i\n", dev->irq);

		goto err_unuse_clocks;
@@ -723,7 +718,7 @@ static int davinci_i2c_probe(struct platform_device *pdev) 
	r = i2c_davinci_cpufreq_register(dev);

	if (r) {

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

		goto err_free_irq;

		goto err_unuse_clocks;

	}



	adap = &dev->adapter;
@@ -740,25 +735,17 @@ static int davinci_i2c_probe(struct platform_device *pdev) 
	r = i2c_add_numbered_adapter(adap);

	if (r) {

		dev_err(&pdev->dev, "failure adding adapter\n");

		goto err_free_irq;

		goto err_unuse_clocks;

	}

	of_i2c_register_devices(adap);



	return 0;



err_free_irq:

	free_irq(dev->irq, dev);

err_unuse_clocks:

	iounmap(dev->base);

err_mem_ioremap:

	clk_disable_unprepare(dev->clk);

	clk_put(dev->clk);

	dev->clk = NULL;

err_free_mem:

	put_device(&pdev->dev);

	kfree(dev);

err_release_region:

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



	return r;

}
@@ -766,7 +753,6 @@ static int davinci_i2c_probe(struct platform_device *pdev) 
static int davinci_i2c_remove(struct platform_device *pdev)

{

	struct davinci_i2c_dev *dev = platform_get_drvdata(pdev);

	struct resource *mem;



	i2c_davinci_cpufreq_deregister(dev);
@@ -774,16 +760,10 @@ static int davinci_i2c_remove(struct platform_device *pdev) 
	put_device(&pdev->dev);



	clk_disable_unprepare(dev->clk);

	clk_put(dev->clk);

	dev->clk = NULL;



	davinci_i2c_write_reg(dev, DAVINCI_I2C_MDR_REG, 0);

	free_irq(dev->irq, dev);

	iounmap(dev->base);

	kfree(dev);



	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

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

	return 0;

}