diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-02-14 03:33:16 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-14 11:09:54 -0500 |
commit | 38515e908ba3a9c467ad3bf347b9bce69216df94 (patch) | |
tree | 3bb0287ad4ea18d61cb3cad74337343ef5034b5d /drivers/ata | |
parent | 3159f06dc2303630c02d1ad2eeaeaf341414c9df (diff) |
[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: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Ingo 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r-- | drivers/ata/pata_mpiix.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_pcmcia.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_pdc2027x.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/pata_mpiix.c b/drivers/ata/pata_mpiix.c index ca8c965179b1..f2e7115f7ab9 100644 --- a/drivers/ata/pata_mpiix.c +++ b/drivers/ata/pata_mpiix.c | |||
@@ -241,7 +241,7 @@ static int mpiix_init_one(struct pci_dev *dev, const struct pci_device_id *id) | |||
241 | probe.port_ops = &mpiix_port_ops; | 241 | probe.port_ops = &mpiix_port_ops; |
242 | probe.sht = &mpiix_sht; | 242 | probe.sht = &mpiix_sht; |
243 | probe.pio_mask = 0x1F; | 243 | probe.pio_mask = 0x1F; |
244 | probe.irq_flags = SA_SHIRQ; | 244 | probe.irq_flags = IRQF_SHARED; |
245 | probe.port_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST; | 245 | probe.port_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST; |
246 | probe.n_ports = 1; | 246 | probe.n_ports = 1; |
247 | 247 | ||
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c index acfc09f9abd9..36468ec6454c 100644 --- a/drivers/ata/pata_pcmcia.c +++ b/drivers/ata/pata_pcmcia.c | |||
@@ -264,7 +264,7 @@ next_entry: | |||
264 | ae.n_ports = 1; | 264 | ae.n_ports = 1; |
265 | ae.pio_mask = 1; /* ISA so PIO 0 cycles */ | 265 | ae.pio_mask = 1; /* ISA so PIO 0 cycles */ |
266 | ae.irq = pdev->irq.AssignedIRQ; | 266 | ae.irq = pdev->irq.AssignedIRQ; |
267 | ae.irq_flags = SA_SHIRQ; | 267 | ae.irq_flags = IRQF_SHARED; |
268 | ae.port_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST; | 268 | ae.port_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST; |
269 | ae.port[0].cmd_addr = io_addr; | 269 | ae.port[0].cmd_addr = io_addr; |
270 | ae.port[0].altstatus_addr = ctl_addr; | 270 | ae.port[0].altstatus_addr = ctl_addr; |
diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c index ffa7f47fbb20..61537873d28e 100644 --- a/drivers/ata/pata_pdc2027x.c +++ b/drivers/ata/pata_pdc2027x.c | |||
@@ -796,7 +796,7 @@ static int __devinit pdc2027x_init_one(struct pci_dev *pdev, const struct pci_de | |||
796 | probe_ent->port_ops = pdc2027x_port_info[board_idx].port_ops; | 796 | probe_ent->port_ops = pdc2027x_port_info[board_idx].port_ops; |
797 | 797 | ||
798 | probe_ent->irq = pdev->irq; | 798 | probe_ent->irq = pdev->irq; |
799 | probe_ent->irq_flags = SA_SHIRQ; | 799 | probe_ent->irq_flags = IRQF_SHARED; |
800 | probe_ent->iomap = pcim_iomap_table(pdev); | 800 | probe_ent->iomap = pcim_iomap_table(pdev); |
801 | 801 | ||
802 | mmio_base = probe_ent->iomap[PDC_MMIO_BAR]; | 802 | mmio_base = probe_ent->iomap[PDC_MMIO_BAR]; |