From: Thomas Gleixner The obsolete SA_xxx interrupt flags have been used despite the scheduled removal. Fixup the remaining users in -mm. Signed-off-by: Thomas Gleixner Acked-by: Ingo Molnar Signed-off-by: Andrew Morton --- arch/i386/kernel/vmitime.c | 10 ++++------ drivers/char/nozomi.c | 2 +- drivers/firewire/fw-ohci.c | 2 +- drivers/input/keyboard/gpio_keys.c | 2 +- drivers/mtd/nand/cafe.c | 3 ++- drivers/net/cxgb3/cxgb3_main.c | 3 ++- drivers/net/sc92031.c | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff -puN arch/i386/kernel/vmitime.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups-2 arch/i386/kernel/vmitime.c --- a/arch/i386/kernel/vmitime.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups-2 +++ a/arch/i386/kernel/vmitime.c @@ -121,12 +121,10 @@ static struct clocksource clocksource_vm static irqreturn_t vmi_timer_interrupt(int irq, void *dev_id); struct irqaction vmi_timer_irq = { - vmi_timer_interrupt, - SA_INTERRUPT, - CPU_MASK_NONE, - "VMI-alarm", - NULL, - NULL + .handler = vmi_timer_interrupt, + .flags = IRQF_DISABLED, + .mask = CPU_MASK_NONE, + .name = "VMI-alarm", }; /* Alarm rate */ diff -puN drivers/char/nozomi.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups-2 drivers/char/nozomi.c --- a/drivers/char/nozomi.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups-2 +++ a/drivers/char/nozomi.c @@ -1378,7 +1378,7 @@ static int nozomi_setup_interrupt(struct { int rval; - rval = request_irq(dc->pdev->irq, &interrupt_handler, SA_SHIRQ, + rval = request_irq(dc->pdev->irq, &interrupt_handler, IRQF_SHARED, NOZOMI_NAME, dc); if (rval) dev_err(&dc->pdev->dev, "Cannot open because IRQ %d " diff -puN drivers/firewire/fw-ohci.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups-2 drivers/firewire/fw-ohci.c --- a/drivers/firewire/fw-ohci.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups-2 +++ a/drivers/firewire/fw-ohci.c @@ -711,7 +711,7 @@ static int ohci_enable(struct fw_card *c reg_write(ohci, OHCI1394_AsReqFilterHiSet, 0x80000000); if (request_irq(dev->irq, irq_handler, - SA_SHIRQ, ohci_driver_name, ohci)) { + IRQF_SHARED, ohci_driver_name, ohci)) { fw_error("Failed to allocate shared interrupt %d.\n", dev->irq); dma_free_coherent(ohci->card.device, CONFIG_ROM_SIZE, diff -puN drivers/input/keyboard/gpio_keys.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups-2 drivers/input/keyboard/gpio_keys.c --- a/drivers/input/keyboard/gpio_keys.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups-2 +++ a/drivers/input/keyboard/gpio_keys.c @@ -78,7 +78,7 @@ static int __devinit gpio_keys_probe(str int irq = IRQ_GPIO(pdata->buttons[i].gpio); set_irq_type(irq, IRQ_TYPE_EDGE_BOTH); - error = request_irq(irq, gpio_keys_isr, SA_SAMPLE_RANDOM, + error = request_irq(irq, gpio_keys_isr, IRQF_SAMPLE_RANDOM, pdata->buttons[i].desc ? pdata->buttons[i].desc : "gpio_keys", pdev); if (error) { diff -puN drivers/mtd/nand/cafe.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups-2 drivers/mtd/nand/cafe.c --- a/drivers/mtd/nand/cafe.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups-2 +++ a/drivers/mtd/nand/cafe.c @@ -613,7 +613,8 @@ static int __devinit cafe_nand_probe(str cafe_writel(cafe, timing3, NAND_TIMING3); cafe_writel(cafe, 0xffffffff, NAND_IRQ_MASK); - err = request_irq(pdev->irq, &cafe_nand_interrupt, SA_SHIRQ, "CAFE NAND", mtd); + err = request_irq(pdev->irq, &cafe_nand_interrupt, IRQF_SHARED, + "CAFE NAND", mtd); if (err) { dev_warn(&pdev->dev, "Could not register IRQ %d\n", pdev->irq); goto out_free_dma; diff -puN drivers/net/cxgb3/cxgb3_main.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups-2 drivers/net/cxgb3/cxgb3_main.c --- a/drivers/net/cxgb3/cxgb3_main.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups-2 +++ a/drivers/net/cxgb3/cxgb3_main.c @@ -709,7 +709,8 @@ static int cxgb_up(struct adapter *adap) t3_intr_handler(adap, adap->sge.qs[0].rspq. polling), - (adap->flags & USING_MSI) ? 0 : SA_SHIRQ, + (adap->flags & USING_MSI) ? + 0 : IRQF_SHARED, adap->name, adap))) goto irq_err; diff -puN drivers/net/sc92031.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups-2 drivers/net/sc92031.c --- a/drivers/net/sc92031.c~scheduled-removal-of-sa_xxx-interrupt-flags-fixups-2 +++ a/drivers/net/sc92031.c @@ -1035,7 +1035,7 @@ static int sc92031_open(struct net_devic priv->tx_head = priv->tx_tail = 0; err = request_irq(pdev->irq, sc92031_interrupt, - SA_SHIRQ, dev->name, dev); + IRQF_SHARED, dev->name, dev); if (unlikely(err < 0)) goto out_request_irq; _