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

Commit 3cc2d009 authored by Wolfram Sang's avatar Wolfram Sang
Browse files

drivers/i2c/busses: don't check resource with devm_ioremap_resource 



devm_ioremap_resource does sanity checks on the given resource. No need to
duplicate this in the driver.

Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent e42dba56

drivers/i2c/busses/i2c-davinci.c

+1 −7
Original line number Original line Diff line number Diff line
@@ -646,13 +646,6 @@ static int davinci_i2c_probe(struct platform_device *pdev) 
	struct resource *mem, *irq;

	struct resource *mem, *irq;

	int r;

	int r;





	/* NOTE: driver uses the static register mapping */

	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!mem) {

		dev_err(&pdev->dev, "no mem resource?\n");

		return -ENODEV;

	}



	irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	if (!irq) {

	if (!irq) {

		dev_err(&pdev->dev, "no irq resource?\n");

		dev_err(&pdev->dev, "no irq resource?\n");
@@ -697,6 +690,7 @@ static int davinci_i2c_probe(struct platform_device *pdev) 
		return -ENODEV;

		return -ENODEV;

	clk_prepare_enable(dev->clk);

	clk_prepare_enable(dev->clk);





	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

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

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

	if (IS_ERR(dev->base)) {

	if (IS_ERR(dev->base)) {

		r = PTR_ERR(dev->base);

		r = PTR_ERR(dev->base);

drivers/i2c/busses/i2c-designware-platdrv.c

+1 −7
Original line number Original line Diff line number Diff line
@@ -87,13 +87,6 @@ static int dw_i2c_probe(struct platform_device *pdev) 
	struct resource *mem;

	struct resource *mem;

	int irq, r;

	int irq, r;





	/* NOTE: driver uses the static register mapping */

	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!mem) {

		dev_err(&pdev->dev, "no mem resource?\n");

		return -EINVAL;

	}



	irq = platform_get_irq(pdev, 0);

	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

	if (irq < 0) {

		dev_err(&pdev->dev, "no irq resource?\n");

		dev_err(&pdev->dev, "no irq resource?\n");
@@ -104,6 +97,7 @@ static int dw_i2c_probe(struct platform_device *pdev) 
	if (!dev)

	if (!dev)

		return -ENOMEM;

		return -ENOMEM;





	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

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

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

	if (IS_ERR(dev->base))

	if (IS_ERR(dev->base))

		return PTR_ERR(dev->base);

		return PTR_ERR(dev->base);

drivers/i2c/busses/i2c-imx.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -498,17 +498,13 @@ static int __init i2c_imx_probe(struct platform_device *pdev) 




	dev_dbg(&pdev->dev, "<%s>\n", __func__);

	dev_dbg(&pdev->dev, "<%s>\n", __func__);





	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(&pdev->dev, "can't get device resources\n");

		return -ENOENT;

	}

	irq = platform_get_irq(pdev, 0);

	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

	if (irq < 0) {

		dev_err(&pdev->dev, "can't get irq number\n");

		dev_err(&pdev->dev, "can't get irq number\n");

		return -ENOENT;

		return -ENOENT;

	}

	}





	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

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

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

	if (IS_ERR(base))

	if (IS_ERR(base))

		return PTR_ERR(base);

		return PTR_ERR(base);

drivers/i2c/busses/i2c-omap.c

+1 −7
Original line number Original line Diff line number Diff line
@@ -1084,13 +1084,6 @@ omap_i2c_probe(struct platform_device *pdev) 
	u32 rev;

	u32 rev;

	u16 minor, major, scheme;

	u16 minor, major, scheme;





	/* NOTE: driver uses the static register mapping */

	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!mem) {

		dev_err(&pdev->dev, "no mem resource?\n");

		return -ENODEV;

	}



	irq = platform_get_irq(pdev, 0);

	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

	if (irq < 0) {

		dev_err(&pdev->dev, "no irq resource?\n");

		dev_err(&pdev->dev, "no irq resource?\n");
@@ -1103,6 +1096,7 @@ omap_i2c_probe(struct platform_device *pdev) 
		return -ENOMEM;

		return -ENOMEM;

	}

	}





	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

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

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

	if (IS_ERR(dev->base))

	if (IS_ERR(dev->base))

		return PTR_ERR(dev->base);

		return PTR_ERR(dev->base);

drivers/i2c/busses/i2c-rcar.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -623,12 +623,6 @@ static int rcar_i2c_probe(struct platform_device *pdev) 
	u32 bus_speed;

	u32 bus_speed;

	int ret;

	int ret;





	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(dev, "no mmio resources\n");

		return -ENODEV;

	}



	priv = devm_kzalloc(dev, sizeof(struct rcar_i2c_priv), GFP_KERNEL);

	priv = devm_kzalloc(dev, sizeof(struct rcar_i2c_priv), GFP_KERNEL);

	if (!priv) {

	if (!priv) {

		dev_err(dev, "no mem for private data\n");

		dev_err(dev, "no mem for private data\n");
@@ -642,6 +636,7 @@ static int rcar_i2c_probe(struct platform_device *pdev) 
	if (ret < 0)

	if (ret < 0)

		return ret;

		return ret;





	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

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

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

	if (IS_ERR(priv->io))

	if (IS_ERR(priv->io))

		return PTR_ERR(priv->io);

		return PTR_ERR(priv->io);