Commit be4af5df authored by Ben Dooks's avatar Ben Dooks
Browse files

Merge branch 'for-32/i2c/irqflags' into for-linus/i2c-3.2 

Conflicts:
	drivers/i2c/busses/i2c-designware-core.c

Fixed up merge conflic
parents ce0fda16 4311051c

drivers/i2c/busses/i2c-bfin-twi.c

+2 −2
Original line number Diff line number Diff line
@@ -631,7 +631,7 @@ static int i2c_bfin_twi_resume(struct platform_device *pdev) 
	struct bfin_twi_iface *iface = platform_get_drvdata(pdev);



	int rc = request_irq(iface->irq, bfin_twi_interrupt_entry,

		IRQF_DISABLED, pdev->name, iface);

		0, pdev->name, iface);

	if (rc) {

		dev_err(&pdev->dev, "Can't get IRQ %d !\n", iface->irq);

		return -ENODEV;
@@ -702,7 +702,7 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev) 
	}



	rc = request_irq(iface->irq, bfin_twi_interrupt_entry,

		IRQF_DISABLED, pdev->name, iface);

		0, pdev->name, iface);

	if (rc) {

		dev_err(&pdev->dev, "Can't get IRQ %d !\n", iface->irq);

		rc = -ENODEV;

drivers/i2c/busses/i2c-highlander.c

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ static int __devinit highlander_i2c_probe(struct platform_device *pdev) 
		dev->irq = 0;



	if (dev->irq) {

		ret = request_irq(dev->irq, highlander_i2c_irq, IRQF_DISABLED,

		ret = request_irq(dev->irq, highlander_i2c_irq, 0,

				  pdev->name, dev);

		if (unlikely(ret))

			goto err_unmap;

drivers/i2c/busses/i2c-nomadik.c

+1 −1
Original line number Diff line number Diff line
@@ -935,7 +935,7 @@ static int __devinit nmk_i2c_probe(struct platform_device *pdev) 
	}



	dev->irq = platform_get_irq(pdev, 0);

	ret = request_irq(dev->irq, i2c_irq_handler, IRQF_DISABLED,

	ret = request_irq(dev->irq, i2c_irq_handler, 0,

				DRIVER_NAME, dev);

	if (ret) {

		dev_err(&pdev->dev, "cannot claim the irq %d\n", dev->irq);

drivers/i2c/busses/i2c-nuc900.c

+1 −1
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ static int __devinit nuc900_i2c_probe(struct platform_device *pdev) 
		goto err_iomap;

	}



	ret = request_irq(i2c->irq, nuc900_i2c_irq, IRQF_DISABLED | IRQF_SHARED,

	ret = request_irq(i2c->irq, nuc900_i2c_irq, IRQF_SHARED,

			  dev_name(&pdev->dev), i2c);



	if (ret != 0) {

drivers/i2c/busses/i2c-pmcmsp.c

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ static int __devinit pmcmsptwi_probe(struct platform_device *pldev) 
	pmcmsptwi_data.irq = platform_get_irq(pldev, 0);

	if (pmcmsptwi_data.irq) {

		rc = request_irq(pmcmsptwi_data.irq, &pmcmsptwi_interrupt,

			IRQF_SHARED | IRQF_DISABLED | IRQF_SAMPLE_RANDOM,

			IRQF_SHARED | IRQF_SAMPLE_RANDOM,

			pldev->name, &pmcmsptwi_data);

		if (rc == 0) {

			/*