mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
[PATCH] irq-flags: SH64: Use the new IRQF_ constants
Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: "David S. Miller" <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
dacdb3b23a
commit
5fb55ae955
6 changed files with 9 additions and 11 deletions
|
|
@ -115,7 +115,7 @@ static irqreturn_t dma_mte(int irq, void *dev_id, struct pt_regs *regs)
|
|||
|
||||
static struct irqaction irq_dmte = {
|
||||
.handler = dma_mte,
|
||||
.flags = SA_INTERRUPT,
|
||||
.flags = IRQF_DISABLED,
|
||||
.name = "DMA MTE",
|
||||
};
|
||||
|
||||
|
|
@ -152,7 +152,7 @@ static irqreturn_t dma_err(int irq, void *dev_id, struct pt_regs *regs)
|
|||
|
||||
static struct irqaction irq_derr = {
|
||||
.handler = dma_err,
|
||||
.flags = SA_INTERRUPT,
|
||||
.flags = IRQF_DISABLED,
|
||||
.name = "DMA Error",
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -473,13 +473,13 @@ static void __init pcibios_size_bridges(void)
|
|||
static int __init pcibios_init(void)
|
||||
{
|
||||
if (request_irq(IRQ_ERR, pcish5_err_irq,
|
||||
SA_INTERRUPT, "PCI Error",NULL) < 0) {
|
||||
IRQF_DISABLED, "PCI Error",NULL) < 0) {
|
||||
printk(KERN_ERR "PCISH5: Cannot hook PCI_PERR interrupt\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (request_irq(IRQ_SERR, pcish5_serr_irq,
|
||||
SA_INTERRUPT, "PCI SERR interrupt", NULL) < 0) {
|
||||
IRQF_DISABLED, "PCI SERR interrupt", NULL) < 0) {
|
||||
printk(KERN_ERR "PCISH5: Cannot hook PCI_SERR interrupt\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -484,8 +484,8 @@ static irqreturn_t sh64_rtc_interrupt(int irq, void *dev_id,
|
|||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
static struct irqaction irq0 = { timer_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "timer", NULL, NULL};
|
||||
static struct irqaction irq1 = { sh64_rtc_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "rtc", NULL, NULL};
|
||||
static struct irqaction irq0 = { timer_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "timer", NULL, NULL};
|
||||
static struct irqaction irq1 = { sh64_rtc_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "rtc", NULL, NULL};
|
||||
|
||||
void __init time_init(void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -44,13 +44,13 @@ static irqreturn_t cayman_interrupt_pci2(int irq, void *dev_id, struct pt_regs *
|
|||
static struct irqaction cayman_action_smsc = {
|
||||
.name = "Cayman SMSC Mux",
|
||||
.handler = cayman_interrupt_smsc,
|
||||
.flags = SA_INTERRUPT,
|
||||
.flags = IRQF_DISABLED,
|
||||
};
|
||||
|
||||
static struct irqaction cayman_action_pci2 = {
|
||||
.name = "Cayman PCI2 Mux",
|
||||
.handler = cayman_interrupt_pci2,
|
||||
.flags = SA_INTERRUPT,
|
||||
.flags = IRQF_DISABLED,
|
||||
};
|
||||
|
||||
static void enable_cayman_irq(unsigned int irq)
|
||||
|
|
|
|||
Loading…
Reference in a new issue