Commit d1ccc125 authored by Jingoo Han's avatar Jingoo Han Committed by Wolfram Sang
Browse files

i2c: pnx: Use devm_*() functions 



Use devm_*() functions to make cleanup paths simpler,
and remove redundant return value check of platform_get_resource()
because the value is checked by devm_ioremap_resource().

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent d9a3afc2

drivers/i2c/busses/i2c-pnx.c

+13 −51
Original line number Diff line number Diff line
@@ -628,11 +628,9 @@ static int i2c_pnx_probe(struct platform_device *pdev) 
	struct resource *res;

	u32 speed = I2C_PNX_SPEED_KHZ_DEFAULT * 1000;



	alg_data = kzalloc(sizeof(*alg_data), GFP_KERNEL);

	if (!alg_data) {

		ret = -ENOMEM;

		goto err_kzalloc;

	}

	alg_data = devm_kzalloc(&pdev->dev, sizeof(*alg_data), GFP_KERNEL);

	if (!alg_data)

		return -ENOMEM;



	platform_set_drvdata(pdev, alg_data);
@@ -657,11 +655,9 @@ static int i2c_pnx_probe(struct platform_device *pdev) 
		 */

	}

#endif

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

	if (IS_ERR(alg_data->clk)) {

		ret = PTR_ERR(alg_data->clk);

		goto out_drvdata;

	}

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

	if (IS_ERR(alg_data->clk))

		return PTR_ERR(alg_data->clk);



	init_timer(&alg_data->mif.timer);

	alg_data->mif.timer.function = i2c_pnx_timeout;
@@ -672,31 +668,13 @@ static int i2c_pnx_probe(struct platform_device *pdev) 


	/* Register I/O resource */

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(&pdev->dev, "Unable to get mem resource.\n");

		ret = -EBUSY;

		goto out_clkget;

	}

	if (!request_mem_region(res->start, I2C_PNX_REGION_SIZE,

				pdev->name)) {

		dev_err(&pdev->dev,

		       "I/O region 0x%08x for I2C already in use.\n",

		       res->start);

		ret = -ENOMEM;

		goto out_clkget;

	}



	alg_data->base = res->start;

	alg_data->ioaddr = ioremap(res->start, I2C_PNX_REGION_SIZE);

	if (!alg_data->ioaddr) {

		dev_err(&pdev->dev, "Couldn't ioremap I2C I/O region\n");

		ret = -ENOMEM;

		goto out_release;

	}

	alg_data->ioaddr = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(alg_data->ioaddr))

		return PTR_ERR(alg_data->ioaddr);



	ret = clk_enable(alg_data->clk);

	if (ret)

		goto out_unmap;

		return ret;



	freq = clk_get_rate(alg_data->clk);
@@ -730,7 +708,7 @@ static int i2c_pnx_probe(struct platform_device *pdev) 
		ret = alg_data->irq;

		goto out_clock;

	}

	ret = request_irq(alg_data->irq, i2c_pnx_interrupt,

	ret = devm_request_irq(&pdev->dev, alg_data->irq, i2c_pnx_interrupt,

			       0, pdev->name, alg_data);

	if (ret)

		goto out_clock;
@@ -739,7 +717,7 @@ static int i2c_pnx_probe(struct platform_device *pdev) 
	ret = i2c_add_numbered_adapter(&alg_data->adapter);

	if (ret < 0) {

		dev_err(&pdev->dev, "I2C: Failed to add bus\n");

		goto out_irq;

		goto out_clock;

	}



	dev_dbg(&pdev->dev, "%s: Master at %#8x, irq %d.\n",
@@ -747,19 +725,8 @@ static int i2c_pnx_probe(struct platform_device *pdev) 


	return 0;



out_irq:

	free_irq(alg_data->irq, alg_data);

out_clock:

	clk_disable(alg_data->clk);

out_unmap:

	iounmap(alg_data->ioaddr);

out_release:

	release_mem_region(res->start, I2C_PNX_REGION_SIZE);

out_clkget:

	clk_put(alg_data->clk);

out_drvdata:

	kfree(alg_data);

err_kzalloc:

	return ret;

}
@@ -767,13 +734,8 @@ static int i2c_pnx_remove(struct platform_device *pdev) 
{

	struct i2c_pnx_algo_data *alg_data = platform_get_drvdata(pdev);



	free_irq(alg_data->irq, alg_data);

	i2c_del_adapter(&alg_data->adapter);

	clk_disable(alg_data->clk);

	iounmap(alg_data->ioaddr);

	release_mem_region(alg_data->base, I2C_PNX_REGION_SIZE);

	clk_put(alg_data->clk);

	kfree(alg_data);



	return 0;

}

include/linux/i2c-pnx.h

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ struct i2c_pnx_algo_data { 
	int			last;

	struct clk		*clk;

	struct i2c_adapter	adapter;

	phys_addr_t		base;

	int			irq;

	u32			timeout;

};