Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-16 09:02:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Fixed up merge conflic
This commit is contained in:
Ben Dooks 2011-11-01 00:52:53 +00:00
commit be4af5dfa6
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/i2c/busses/i2c-bfin-twi.c
View File

@ -631,7 +631,7 @@ static int i2c_bfin_twi_resume(struct platform_device *pdev)
struct bfin_twi_iface *iface = platform_get_drvdata(pdev); struct bfin_twi_iface *iface = platform_get_drvdata(pdev);
int rc = request_irq(iface->irq, bfin_twi_interrupt_entry, int rc = request_irq(iface->irq, bfin_twi_interrupt_entry,
IRQF_DISABLED, pdev->name, iface); 0, pdev->name, iface);
if (rc) { if (rc) {
dev_err(&pdev->dev, "Can't get IRQ %d !\n", iface->irq); dev_err(&pdev->dev, "Can't get IRQ %d !\n", iface->irq);
return -ENODEV; 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, rc = request_irq(iface->irq, bfin_twi_interrupt_entry,
IRQF_DISABLED, pdev->name, iface); 0, pdev->name, iface);
if (rc) { if (rc) {
dev_err(&pdev->dev, "Can't get IRQ %d !\n", iface->irq); dev_err(&pdev->dev, "Can't get IRQ %d !\n", iface->irq);
rc = -ENODEV; rc = -ENODEV;

2
drivers/i2c/busses/i2c-highlander.c
View File

@ -387,7 +387,7 @@ static int __devinit highlander_i2c_probe(struct platform_device *pdev)
dev->irq = 0; dev->irq = 0;
if (dev->irq) { 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); pdev->name, dev);
if (unlikely(ret)) if (unlikely(ret))
goto err_unmap; goto err_unmap;

2
drivers/i2c/busses/i2c-nomadik.c
View File

@ -935,7 +935,7 @@ static int __devinit nmk_i2c_probe(struct platform_device *pdev)
} }
dev->irq = platform_get_irq(pdev, 0); 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); DRIVER_NAME, dev);
if (ret) { if (ret) {
dev_err(&pdev->dev, "cannot claim the irq %d\n", dev->irq); dev_err(&pdev->dev, "cannot claim the irq %d\n", dev->irq);

2
drivers/i2c/busses/i2c-nuc900.c
View File

@ -610,7 +610,7 @@ static int __devinit nuc900_i2c_probe(struct platform_device *pdev)
goto err_iomap; 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); dev_name(&pdev->dev), i2c);
if (ret != 0) { if (ret != 0) {

2
drivers/i2c/busses/i2c-pmcmsp.c
View File

@ -306,7 +306,7 @@ static int __devinit pmcmsptwi_probe(struct platform_device *pldev)
pmcmsptwi_data.irq = platform_get_irq(pldev, 0); pmcmsptwi_data.irq = platform_get_irq(pldev, 0);
if (pmcmsptwi_data.irq) { if (pmcmsptwi_data.irq) {
rc = request_irq(pmcmsptwi_data.irq, &pmcmsptwi_interrupt, rc = request_irq(pmcmsptwi_data.irq, &pmcmsptwi_interrupt,
IRQF_SHARED | IRQF_DISABLED | IRQF_SAMPLE_RANDOM, IRQF_SHARED | IRQF_SAMPLE_RANDOM,
pldev->name, &pmcmsptwi_data); pldev->name, &pmcmsptwi_data);
if (rc == 0) { if (rc == 0) {
/* /*

2
drivers/i2c/busses/i2c-s3c2410.c
View File

@ -883,7 +883,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
goto err_iomap; 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); dev_name(&pdev->dev), i2c);
if (ret != 0) { if (ret != 0) {

2
drivers/i2c/busses/i2c-sh7760.c
View File

@ -502,7 +502,7 @@ static int __devinit sh7760_i2c_probe(struct platform_device *pdev)
} }
OUT32(id, I2CCCR, ret); 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)) { SH7760_I2C_DEVNAME, id)) {
dev_err(&pdev->dev, "cannot get irq %d\n", id->irq); dev_err(&pdev->dev, "cannot get irq %d\n", id->irq);
ret = -EBUSY; ret = -EBUSY;

2
drivers/i2c/busses/i2c-sh_mobile.c
View File

@ -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))) { while ((res = platform_get_resource(dev, IORESOURCE_IRQ, k))) {
for (n = res->start; hook && n <= res->end; n++) { 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)) { dev_name(&dev->dev), dev)) {
for (n--; n >= res->start; n--) for (n--; n >= res->start; n--)
free_irq(n, dev); free_irq(n, dev);

2
drivers/i2c/busses/i2c-stu300.c
View File

@ -916,7 +916,7 @@ stu300_probe(struct platform_device *pdev)
} }
dev->irq = platform_get_irq(pdev, 0); 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)) { NAME, dev)) {
ret = -EIO; ret = -EIO;
goto err_no_irq; goto err_no_irq;