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

Commit 5fb55ae9 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

[PATCH] irq-flags: SH64: Use the new IRQF_ constants 



Use the new IRQF_ constants and remove the SA_INTERRUPT define

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent dacdb3b2

arch/sh64/kernel/dma.c

+2 −2
Original line number Diff line number Diff line
@@ -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",

};

arch/sh64/kernel/pci_sh5.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

        }

arch/sh64/kernel/time.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

{

arch/sh64/mach-cayman/irq.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

include/asm-sh64/keyboard.h

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ extern unsigned char pckbd_sysrq_xlate[128]; 
#endif



#define aux_request_irq(hand, dev_id)					\

	request_irq(AUX_IRQ, hand, SA_SHIRQ, "PS2 Mouse", dev_id)

	request_irq(AUX_IRQ, hand, IRQF_SHARED, "PS2 Mouse", dev_id)



#define aux_free_irq(dev_id) free_irq(AUX_IRQ, dev_id)