Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38515e90 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

[PATCH] Scheduled removal of SA_xxx interrupt flags fixups 



The obsolete SA_xxx interrupt flags have been used despite the scheduled
removal.  Fixup the remaining users.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Wim Van Sebroeck <wim@iguana.be>
Cc: Roland Dreier <rolandd@cisco.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: Greg KH <greg@kroah.com>
Cc: Dave Airlie <airlied@linux.ie>
Cc: James Simmons <jsimmons@infradead.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3159f06d

arch/ia64/kernel/irq_ia64.c

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ static struct irqaction ipi_irqaction = { 


static struct irqaction resched_irqaction = {

	.handler =	dummy_handler,

	.flags =	SA_INTERRUPT,

	.flags =	IRQF_DISABLED,

	.name =		"resched"

};

#endif

arch/m68k/atari/stdma.c

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ int stdma_islocked(void) 
void __init stdma_init(void)

{

	stdma_isr = NULL;

	request_irq(IRQ_MFP_FDC, stdma_int, IRQ_TYPE_SLOW | SA_SHIRQ,

	request_irq(IRQ_MFP_FDC, stdma_int, IRQ_TYPE_SLOW | IRQF_SHARED,

	            "ST-DMA: floppy/ACSI/IDE/Falcon-SCSI", stdma_int);

}

arch/ppc/syslib/i8259.c

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ static struct resource pic_edgectrl_iores = { 


static struct irqaction i8259_irqaction = {

	.handler = no_action,

	.flags = SA_INTERRUPT,

	.flags = IRQF_DISABLED,

	.mask = CPU_MASK_NONE,

	.name = "82c59 secondary cascade",

};

drivers/ata/pata_mpiix.c

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ static int mpiix_init_one(struct pci_dev *dev, const struct pci_device_id *id) 
	probe.port_ops = &mpiix_port_ops;

	probe.sht = &mpiix_sht;

	probe.pio_mask = 0x1F;

	probe.irq_flags = SA_SHIRQ;

	probe.irq_flags = IRQF_SHARED;

	probe.port_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST;

	probe.n_ports = 1;

drivers/ata/pata_pcmcia.c

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ static int pcmcia_init_one(struct pcmcia_device *pdev) 
	ae.n_ports = 1;

	ae.pio_mask = 1;		/* ISA so PIO 0 cycles */

	ae.irq = pdev->irq.AssignedIRQ;

	ae.irq_flags = SA_SHIRQ;

	ae.irq_flags = IRQF_SHARED;

	ae.port_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST;

	ae.port[0].cmd_addr = io_addr;

	ae.port[0].altstatus_addr = ctl_addr;