aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses
diff options
context:
space:
mode:
authorYong Zhang <yong.zhang0@gmail.com>2011-09-21 05:28:33 -0400
committerBen Dooks <ben-linux@fluff.org>2011-10-29 04:55:45 -0400
commit4311051c358ad0e66b68934e7a33cf10ba533466 (patch)
tree69ff508ee8fe09f63366acfbe5e3480399689276 /drivers/i2c/busses
parent1fdb24e969110fafea36d3b393bea438f702c87f (diff)
i2c: irq: Remove IRQF_DISABLED
Since commit [c58543c8: genirq: Run irq handlers with interrupts disabled], We run all interrupt handlers with interrupts disabled and we even check and yell when an interrupt handler returns with interrupts enabled (see commit [b738a50a: genirq: Warn when handler enables interrupts]). So now this flag is a NOOP and can be removed. Signed-off-by: Yong Zhang <yong.zhang0@gmail.com> Acked-by: Wolfram Sang <w.sang@pengutronix.de> Acked-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Barry Song <21cnbao@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'drivers/i2c/busses')
-rw-r--r--drivers/i2c/busses/i2c-bfin-twi.c4
-rw-r--r--drivers/i2c/busses/i2c-designware.c2
-rw-r--r--drivers/i2c/busses/i2c-highlander.c2
-rw-r--r--drivers/i2c/busses/i2c-nomadik.c2
-rw-r--r--drivers/i2c/busses/i2c-nuc900.c2
-rw-r--r--drivers/i2c/busses/i2c-pmcmsp.c2
-rw-r--r--drivers/i2c/busses/i2c-s3c2410.c2
-rw-r--r--drivers/i2c/busses/i2c-sh7760.c2
-rw-r--r--drivers/i2c/busses/i2c-sh_mobile.c2
-rw-r--r--drivers/i2c/busses/i2c-stu300.c2
10 files changed, 11 insertions, 11 deletions
diff --git a/drivers/i2c/busses/i2c-bfin-twi.c b/drivers/i2c/busses/i2c-bfin-twi.c
index cbc98aea5b09..cdb59e5b23f7 100644
--- 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)
631 struct bfin_twi_iface *iface = platform_get_drvdata(pdev); 631 struct bfin_twi_iface *iface = platform_get_drvdata(pdev);
632 632
633 int rc = request_irq(iface->irq, bfin_twi_interrupt_entry, 633 int rc = request_irq(iface->irq, bfin_twi_interrupt_entry,
634 IRQF_DISABLED, pdev->name, iface); 634 0, pdev->name, iface);
635 if (rc) { 635 if (rc) {
636 dev_err(&pdev->dev, "Can't get IRQ %d !\n", iface->irq); 636 dev_err(&pdev->dev, "Can't get IRQ %d !\n", iface->irq);
637 return -ENODEV; 637 return -ENODEV;
@@ -702,7 +702,7 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
702 } 702 }
703 703
704 rc = request_irq(iface->irq, bfin_twi_interrupt_entry, 704 rc = request_irq(iface->irq, bfin_twi_interrupt_entry,
705 IRQF_DISABLED, pdev->name, iface); 705 0, pdev->name, iface);
706 if (rc) { 706 if (rc) {
707 dev_err(&pdev->dev, "Can't get IRQ %d !\n", iface->irq); 707 dev_err(&pdev->dev, "Can't get IRQ %d !\n", iface->irq);
708 rc = -ENODEV; 708 rc = -ENODEV;
diff --git a/drivers/i2c/busses/i2c-designware.c b/drivers/i2c/busses/i2c-designware.c
index 1b42b50b5992..2ac1903f167e 100644
--- a/drivers/i2c/busses/i2c-designware.c
+++ b/drivers/i2c/busses/i2c-designware.c
@@ -755,7 +755,7 @@ static int __devinit dw_i2c_probe(struct platform_device *pdev)
755 i2c_dw_init(dev); 755 i2c_dw_init(dev);
756 756
757 writel(0, dev->base + DW_IC_INTR_MASK); /* disable IRQ */ 757 writel(0, dev->base + DW_IC_INTR_MASK); /* disable IRQ */
758 r = request_irq(dev->irq, i2c_dw_isr, IRQF_DISABLED, pdev->name, dev); 758 r = request_irq(dev->irq, i2c_dw_isr, 0, pdev->name, dev);
759 if (r) { 759 if (r) {
760 dev_err(&pdev->dev, "failure requesting irq %i\n", dev->irq); 760 dev_err(&pdev->dev, "failure requesting irq %i\n", dev->irq);
761 goto err_iounmap; 761 goto err_iounmap;
diff --git a/drivers/i2c/busses/i2c-highlander.c b/drivers/i2c/busses/i2c-highlander.c
index 3876a2478bd7..63bb1cc2a042 100644
--- 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)
387 dev->irq = 0; 387 dev->irq = 0;
388 388
389 if (dev->irq) { 389 if (dev->irq) {
390 ret = request_irq(dev->irq, highlander_i2c_irq, IRQF_DISABLED, 390 ret = request_irq(dev->irq, highlander_i2c_irq, 0,
391 pdev->name, dev); 391 pdev->name, dev);
392 if (unlikely(ret)) 392 if (unlikely(ret))
393 goto err_unmap; 393 goto err_unmap;
diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index b228e09c5d05..40702e8e95c7 100644
--- 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)
935 } 935 }
936 936
937 dev->irq = platform_get_irq(pdev, 0); 937 dev->irq = platform_get_irq(pdev, 0);
938 ret = request_irq(dev->irq, i2c_irq_handler, IRQF_DISABLED, 938 ret = request_irq(dev->irq, i2c_irq_handler, 0,
939 DRIVER_NAME, dev); 939 DRIVER_NAME, dev);
940 if (ret) { 940 if (ret) {
941 dev_err(&pdev->dev, "cannot claim the irq %d\n", dev->irq); 941 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 72434263787b..835e47b39bc2 100644
--- 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)
610 goto err_iomap; 610 goto err_iomap;
611 } 611 }
612 612
613 ret = request_irq(i2c->irq, nuc900_i2c_irq, IRQF_DISABLED | IRQF_SHARED, 613 ret = request_irq(i2c->irq, nuc900_i2c_irq, IRQF_SHARED,
614 dev_name(&pdev->dev), i2c); 614 dev_name(&pdev->dev), i2c);
615 615
616 if (ret != 0) { 616 if (ret != 0) {
diff --git a/drivers/i2c/busses/i2c-pmcmsp.c b/drivers/i2c/busses/i2c-pmcmsp.c
index dfa7ae9c1b8e..127051b06921 100644
--- 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)
306 pmcmsptwi_data.irq = platform_get_irq(pldev, 0); 306 pmcmsptwi_data.irq = platform_get_irq(pldev, 0);
307 if (pmcmsptwi_data.irq) { 307 if (pmcmsptwi_data.irq) {
308 rc = request_irq(pmcmsptwi_data.irq, &pmcmsptwi_interrupt, 308 rc = request_irq(pmcmsptwi_data.irq, &pmcmsptwi_interrupt,
309 IRQF_SHARED | IRQF_DISABLED | IRQF_SAMPLE_RANDOM, 309 IRQF_SHARED | IRQF_SAMPLE_RANDOM,
310 pldev->name, &pmcmsptwi_data); 310 pldev->name, &pmcmsptwi_data);
311 if (rc == 0) { 311 if (rc == 0) {
312 /* 312 /*
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index f84a63c6dd97..545ca88a9153 100644
--- 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)
883 goto err_iomap; 883 goto err_iomap;
884 } 884 }
885 885
886 ret = request_irq(i2c->irq, s3c24xx_i2c_irq, IRQF_DISABLED, 886 ret = request_irq(i2c->irq, s3c24xx_i2c_irq, 0,
887 dev_name(&pdev->dev), i2c); 887 dev_name(&pdev->dev), i2c);
888 888
889 if (ret != 0) { 889 if (ret != 0) {
diff --git a/drivers/i2c/busses/i2c-sh7760.c b/drivers/i2c/busses/i2c-sh7760.c
index 3cad8fecc3d3..c418c41eff3d 100644
--- 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)
502 } 502 }
503 OUT32(id, I2CCCR, ret); 503 OUT32(id, I2CCCR, ret);
504 504
505 if (request_irq(id->irq, sh7760_i2c_irq, IRQF_DISABLED, 505 if (request_irq(id->irq, sh7760_i2c_irq, 0,
506 SH7760_I2C_DEVNAME, id)) { 506 SH7760_I2C_DEVNAME, id)) {
507 dev_err(&pdev->dev, "cannot get irq %d\n", id->irq); 507 dev_err(&pdev->dev, "cannot get irq %d\n", id->irq);
508 ret = -EBUSY; 508 ret = -EBUSY;
diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c
index f633a53b6dbe..675c9692d148 100644
--- 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)
543 543
544 while ((res = platform_get_resource(dev, IORESOURCE_IRQ, k))) { 544 while ((res = platform_get_resource(dev, IORESOURCE_IRQ, k))) {
545 for (n = res->start; hook && n <= res->end; n++) { 545 for (n = res->start; hook && n <= res->end; n++) {
546 if (request_irq(n, sh_mobile_i2c_isr, IRQF_DISABLED, 546 if (request_irq(n, sh_mobile_i2c_isr, 0,
547 dev_name(&dev->dev), dev)) { 547 dev_name(&dev->dev), dev)) {
548 for (n--; n >= res->start; n--) 548 for (n--; n >= res->start; n--)
549 free_irq(n, dev); 549 free_irq(n, dev);
diff --git a/drivers/i2c/busses/i2c-stu300.c b/drivers/i2c/busses/i2c-stu300.c
index 99879617e686..4d44af181f37 100644
--- a/drivers/i2c/busses/i2c-stu300.c
+++ b/drivers/i2c/busses/i2c-stu300.c
@@ -916,7 +916,7 @@ stu300_probe(struct platform_device *pdev)
916 } 916 }
917 917
918 dev->irq = platform_get_irq(pdev, 0); 918 dev->irq = platform_get_irq(pdev, 0);
919 if (request_irq(dev->irq, stu300_irh, IRQF_DISABLED, 919 if (request_irq(dev->irq, stu300_irh, 0,
920 NAME, dev)) { 920 NAME, dev)) {
921 ret = -EIO; 921 ret = -EIO;
922 goto err_no_irq; 922 goto err_no_irq;