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

i2c: busses: convert to devm_platform_get_and_ioremap_resource 



use devm_platform_get_and_ioremap_resource() to simplify code, which
contains platform_get_resource() and devm_ioremap_resource(), it also
get the resource for use by the following code.

Signed-off-by: default avatarDejin Zheng <zhengdejin5@gmail.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent e0442d76

drivers/i2c/busses/i2c-cadence.c

+1 −2
Original line number Diff line number Diff line
@@ -906,8 +906,7 @@ static int cdns_i2c_probe(struct platform_device *pdev) 
		id->quirks = data->quirks;

	}



	r_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	id->membase = devm_ioremap_resource(&pdev->dev, r_mem);

	id->membase = devm_platform_get_and_ioremap_resource(pdev, 0, &r_mem);

	if (IS_ERR(id->membase))

		return PTR_ERR(id->membase);

drivers/i2c/busses/i2c-pca-platform.c

+1 −2
Original line number Diff line number Diff line
@@ -149,8 +149,7 @@ static int i2c_pca_pf_probe(struct platform_device *pdev) 
	if (!i2c)

		return -ENOMEM;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

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

	i2c->reg_base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);

	if (IS_ERR(i2c->reg_base))

		return PTR_ERR(i2c->reg_base);

drivers/i2c/busses/i2c-rcar.c

+1 −3
Original line number Diff line number Diff line
@@ -938,9 +938,7 @@ static int rcar_i2c_probe(struct platform_device *pdev) 
		return PTR_ERR(priv->clk);

	}



	priv->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);



	priv->io = devm_ioremap_resource(dev, priv->res);

	priv->io = devm_platform_get_and_ioremap_resource(pdev, 0, &priv->res);

	if (IS_ERR(priv->io))

		return PTR_ERR(priv->io);

drivers/i2c/busses/i2c-stm32f7.c

+1 −2
Original line number Diff line number Diff line
@@ -1940,8 +1940,7 @@ static int stm32f7_i2c_probe(struct platform_device *pdev) 
	if (!i2c_dev)

		return -ENOMEM;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

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

	i2c_dev->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);

	if (IS_ERR(i2c_dev->base))

		return PTR_ERR(i2c_dev->base);

	phy_addr = (dma_addr_t)res->start;