Commit e0442d76 authored by Dejin Zheng's avatar Dejin Zheng Committed by Wolfram Sang
Browse files

i2c: busses: convert to devm_platform_ioremap_resource 



use devm_platform_ioremap_resource() to simplify code, it
contains platform_get_resource and devm_ioremap_resource.

Reviewed-by: default avatarBarry Song <baohua@kernel.org>
Acked-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Acked-by: default avatarRobert Richter <rrichter@marvell.com>
Acked-by: default avatarThor Thayer <thor.thayer@linux.intel.com>
Acked-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarDejin Zheng <zhengdejin5@gmail.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 8f3d9f35

drivers/i2c/busses/i2c-altera.c

+1 −3
Original line number Diff line number Diff line
@@ -382,7 +382,6 @@ static const struct i2c_algorithm altr_i2c_algo = { 
static int altr_i2c_probe(struct platform_device *pdev)

{

	struct altr_i2c_dev *idev = NULL;

	struct resource *res;

	int irq, ret;

	u32 val;
@@ -390,8 +389,7 @@ static int altr_i2c_probe(struct platform_device *pdev) 
	if (!idev)

		return -ENOMEM;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

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

	idev->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(idev->base))

		return PTR_ERR(idev->base);

drivers/i2c/busses/i2c-axxia.c

+1 −3
Original line number Diff line number Diff line
@@ -734,7 +734,6 @@ static int axxia_i2c_probe(struct platform_device *pdev) 
{

	struct device_node *np = pdev->dev.of_node;

	struct axxia_i2c_dev *idev = NULL;

	struct resource *res;

	void __iomem *base;

	int ret = 0;
@@ -742,8 +741,7 @@ static int axxia_i2c_probe(struct platform_device *pdev) 
	if (!idev)

		return -ENOMEM;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

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

	base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(base))

		return PTR_ERR(base);

drivers/i2c/busses/i2c-bcm-kona.c

+1 −3
Original line number Diff line number Diff line
@@ -750,7 +750,6 @@ static int bcm_kona_i2c_probe(struct platform_device *pdev) 
	int rc = 0;

	struct bcm_kona_i2c_dev *dev;

	struct i2c_adapter *adap;

	struct resource *iomem;



	/* Allocate memory for private data structure */

	dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
@@ -762,8 +761,7 @@ static int bcm_kona_i2c_probe(struct platform_device *pdev) 
	init_completion(&dev->done);



	/* Map hardware registers */

	iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	dev->base = devm_ioremap_resource(dev->device, iomem);

	dev->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(dev->base))

		return -ENOMEM;

drivers/i2c/busses/i2c-davinci.c

+1 −3
Original line number Diff line number Diff line
@@ -761,7 +761,6 @@ static int davinci_i2c_probe(struct platform_device *pdev) 
{

	struct davinci_i2c_dev *dev;

	struct i2c_adapter *adap;

	struct resource *mem;

	struct i2c_bus_recovery_info *rinfo;

	int r, irq;
@@ -814,8 +813,7 @@ static int davinci_i2c_probe(struct platform_device *pdev) 
	if (IS_ERR(dev->clk))

		return PTR_ERR(dev->clk);



	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

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

	dev->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(dev->base)) {

		return PTR_ERR(dev->base);

	}

drivers/i2c/busses/i2c-digicolor.c

+1 −3
Original line number Diff line number Diff line
@@ -290,7 +290,6 @@ static int dc_i2c_probe(struct platform_device *pdev) 
{

	struct device_node *np = pdev->dev.of_node;

	struct dc_i2c *i2c;

	struct resource *r;

	int ret = 0, irq;



	i2c = devm_kzalloc(&pdev->dev, sizeof(struct dc_i2c), GFP_KERNEL);
@@ -311,8 +310,7 @@ static int dc_i2c_probe(struct platform_device *pdev) 
	if (IS_ERR(i2c->clk))

		return PTR_ERR(i2c->clk);



	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	i2c->regs = devm_ioremap_resource(&pdev->dev, r);

	i2c->regs = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(i2c->regs))

		return PTR_ERR(i2c->regs);