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

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

Fixed up merge conflic

diff --git a/drivers/i2c/busses/i2c-bfin-twi.c b/drivers/i2c/busses/i2c-bfin-twi.c
index cbc98aea5b098872cee1c181f24c25c676f62f2e..cdb59e5b23f749aa81153eb6619269d4f248eb61 100644 (file)
--- a/drivers/i2c/busses/i2c-bfin-twi.c
+++ b/drivers/i2c/busses/i2c-bfin-twi.c
@@ -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;

diff --git a/drivers/i2c/busses/i2c-highlander.c b/drivers/i2c/busses/i2c-highlander.c
index 3876a2478bd7a00d11c906aeb4503915a92075ac..63bb1cc2a042125fe87e2bf9243a4bc40ffc5ab8 100644 (file)
--- a/drivers/i2c/busses/i2c-highlander.c
+++ b/drivers/i2c/busses/i2c-highlander.c
@@ -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;

diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index b228e09c5d05aca9fbbfb6e639d1ba2fe0d9bcf4..40702e8e95c7ab8e5dd5a87925403a539b56d701 100644 (file)
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c
@@ -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);

diff --git a/drivers/i2c/busses/i2c-nuc900.c b/drivers/i2c/busses/i2c-nuc900.c
index 72434263787be1e5fe41c7c01c013ca267c986c4..835e47b39bc264535c567669d12a81784a8c90c7 100644 (file)
--- a/drivers/i2c/busses/i2c-nuc900.c
+++ b/drivers/i2c/busses/i2c-nuc900.c
@@ -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) {

diff --git a/drivers/i2c/busses/i2c-pmcmsp.c b/drivers/i2c/busses/i2c-pmcmsp.c
index dfa7ae9c1b8ee8374cf6eaa0f791defc58c98206..127051b06921093f423b055f8b58cf364cc318e3 100644 (file)
--- a/drivers/i2c/busses/i2c-pmcmsp.c
+++ b/drivers/i2c/busses/i2c-pmcmsp.c
@@ -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) {
                        /*

diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index f84a63c6dd9708e329d1571feefde07d56f0de97..545ca88a9153fa2d693d59741a170fadadb049d3 100644 (file)
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -883,7 +883,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
                goto err_iomap;
        }
 
-       ret = request_irq(i2c->irq, s3c24xx_i2c_irq, IRQF_DISABLED,
+       ret = request_irq(i2c->irq, s3c24xx_i2c_irq, 0,
                          dev_name(&pdev->dev), i2c);
 
        if (ret != 0) {

diff --git a/drivers/i2c/busses/i2c-sh7760.c b/drivers/i2c/busses/i2c-sh7760.c
index 3cad8fecc3d3ced40637d8460ebc01afa70dc7dc..c418c41eff3d4ee363a7167b060616b1fcbd858f 100644 (file)
--- a/drivers/i2c/busses/i2c-sh7760.c
+++ b/drivers/i2c/busses/i2c-sh7760.c
@@ -502,7 +502,7 @@ static int __devinit sh7760_i2c_probe(struct platform_device *pdev)
        }
        OUT32(id, I2CCCR, ret);
 
-       if (request_irq(id->irq, sh7760_i2c_irq, IRQF_DISABLED,
+       if (request_irq(id->irq, sh7760_i2c_irq, 0,
                        SH7760_I2C_DEVNAME, id)) {
                dev_err(&pdev->dev, "cannot get irq %d\n", id->irq);
                ret = -EBUSY;

diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c
index f633a53b6dbe0bb3c43daecc345dfac5d4982e7e..675c9692d14860553bbdb03154e5fd88a5e7526f 100644 (file)
--- a/drivers/i2c/busses/i2c-sh_mobile.c
+++ b/drivers/i2c/busses/i2c-sh_mobile.c
@@ -543,7 +543,7 @@ static int sh_mobile_i2c_hook_irqs(struct platform_device *dev, int hook)
 
        while ((res = platform_get_resource(dev, IORESOURCE_IRQ, k))) {
                for (n = res->start; hook && n <= res->end; n++) {
-                       if (request_irq(n, sh_mobile_i2c_isr, IRQF_DISABLED,
+                       if (request_irq(n, sh_mobile_i2c_isr, 0,
                                        dev_name(&dev->dev), dev)) {
                                for (n--; n >= res->start; n--)
                                        free_irq(n, dev);

diff --git a/drivers/i2c/busses/i2c-stu300.c b/drivers/i2c/busses/i2c-stu300.c
index 99879617e68675f4a0a0317d4aac03edeb90afd3..4d44af181f377f2d886fee0d42afb13265a6d32b 100644 (file)
--- a/drivers/i2c/busses/i2c-stu300.c
+++ b/drivers/i2c/busses/i2c-stu300.c
@@ -916,7 +916,7 @@ stu300_probe(struct platform_device *pdev)
        }
 
        dev->irq = platform_get_irq(pdev, 0);
-       if (request_irq(dev->irq, stu300_irh, IRQF_DISABLED,
+       if (request_irq(dev->irq, stu300_irh, 0,
                        NAME, dev)) {
                ret = -EIO;
                goto err_no_irq;