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

Commit 91b52cae authored by Shinya Kuribayashi's avatar Shinya Kuribayashi Committed by Ben Dooks
Browse files

i2c-designware: Use platform_get_irq helper 



Signed-off-by: default avatarShinya Kuribayashi <shinya.kuribayashi@necel.com>
Acked-by: default avatarBaruch Siach <baruch@tkos.co.il>
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent e28000a3

drivers/i2c/busses/i2c-designware.c

+6 −6
Original line number Diff line number Diff line
@@ -548,8 +548,8 @@ static int __devinit dw_i2c_probe(struct platform_device *pdev) 
{

	struct dw_i2c_dev *dev;

	struct i2c_adapter *adap;

	struct resource *mem, *irq, *ioarea;

	int r;

	struct resource *mem, *ioarea;

	int irq, r;



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

	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -558,10 +558,10 @@ static int __devinit dw_i2c_probe(struct platform_device *pdev) 
		return -EINVAL;

	}



	irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	if (!irq) {

	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

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

		return -EINVAL;

		return irq; /* -ENXIO */

	}



	ioarea = request_mem_region(mem->start, resource_size(mem),
@@ -581,7 +581,7 @@ static int __devinit dw_i2c_probe(struct platform_device *pdev) 
	tasklet_init(&dev->pump_msg, dw_i2c_pump_msg, (unsigned long) dev);

	mutex_init(&dev->lock);

	dev->dev = get_device(&pdev->dev);

	dev->irq = irq->start;

	dev->irq = irq;

	platform_set_drvdata(pdev, dev);



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