Skip to content

Commit

Permalink
i2c: irq: Remove IRQF_DISABLED
Browse files Browse the repository at this point in the history 
Since commit [c58543c: 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 [b738a50:
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>
  • Loading branch information
Yong Zhang authored and Ben Dooks committed Oct 29, 2011
1 parent 1fdb24e commit 4311051
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions drivers/i2c/busses/i2c-bfin-twi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/i2c/busses/i2c-designware.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,7 @@ static int __devinit dw_i2c_probe(struct platform_device *pdev)
i2c_dw_init(dev);

writel(0, dev->base + DW_IC_INTR_MASK); /* disable IRQ */
r = request_irq(dev->irq, i2c_dw_isr, IRQF_DISABLED, pdev->name, dev);
r = request_irq(dev->irq, i2c_dw_isr, 0, pdev->name, dev);
if (r) {
dev_err(&pdev->dev, "failure requesting irq %i\n", dev->irq);
goto err_iounmap;
Expand Down
2 changes: 1 addition & 1 deletion drivers/i2c/busses/i2c-highlander.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/i2c/busses/i2c-nomadik.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/i2c/busses/i2c-nuc900.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/i2c/busses/i2c-pmcmsp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
/*
Expand Down
2 changes: 1 addition & 1 deletion drivers/i2c/busses/i2c-s3c2410.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/i2c/busses/i2c-sh7760.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/i2c/busses/i2c-sh_mobile.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/i2c/busses/i2c-stu300.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 4311051

Please sign in to comment.