Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

i2c/ibm-iic: Drop NO_IRQ

Drop NO_IRQ as 0 is the preferred way to describe 'no irq'
(http://lkml.org/lkml/2005/11/21/221). This change is safe, as the driver is
only used on powerpc, where NO_IRQ is 0 anyhow.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Cc: Sean MacLennan <smaclennan@pikatech.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Acked-by: Sean MacLennan <smaclennan@pikatech.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

authored by

Wolfram Sang and committed by
Benjamin Herrenschmidt
13bb5339 6889f959

+7 -7
+7 -7
drivers/i2c/busses/i2c-ibm_iic.c
··· 668 668 int irq; 669 669 670 670 if (iic_force_poll) 671 - return NO_IRQ; 671 + return 0; 672 672 673 673 irq = irq_of_parse_and_map(np, 0); 674 - if (irq == NO_IRQ) { 674 + if (!irq) { 675 675 dev_err(&ofdev->dev, "irq_of_parse_and_map failed\n"); 676 - return NO_IRQ; 676 + return 0; 677 677 } 678 678 679 679 /* Disable interrupts until we finish initialization, assumes ··· 683 683 if (request_irq(irq, iic_handler, 0, "IBM IIC", dev)) { 684 684 dev_err(&ofdev->dev, "request_irq %d failed\n", irq); 685 685 /* Fallback to the polling mode */ 686 - return NO_IRQ; 686 + return 0; 687 687 } 688 688 689 689 return irq; ··· 719 719 init_waitqueue_head(&dev->wq); 720 720 721 721 dev->irq = iic_request_irq(ofdev, dev); 722 - if (dev->irq == NO_IRQ) 722 + if (!dev->irq) 723 723 dev_warn(&ofdev->dev, "using polling mode\n"); 724 724 725 725 /* Board specific settings */ ··· 766 766 return 0; 767 767 768 768 error_cleanup: 769 - if (dev->irq != NO_IRQ) { 769 + if (dev->irq) { 770 770 iic_interrupt_mode(dev, 0); 771 771 free_irq(dev->irq, dev); 772 772 } ··· 790 790 791 791 i2c_del_adapter(&dev->adap); 792 792 793 - if (dev->irq != NO_IRQ) { 793 + if (dev->irq) { 794 794 iic_interrupt_mode(dev, 0); 795 795 free_irq(dev->irq, dev); 796 796 }