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

Commit d11584a0 authored by Yong Zhang's avatar Yong Zhang Committed by Paul Mundt
Browse files

SH: irq: Remove IRQF_DISABLED 



Since commit [e58aa3d2: genirq: Run irq handlers with interrupts disabled],
We run all interrupt handlers with interrupts disabled
and we even check and yell when an interrupt handler
returns with interrupts enabled (see commit [b738a50a:
genirq: Warn when handler enables interrupts]).

So now this flag is a NOOP and can be removed.

Signed-off-by: default avatarYong Zhang <yong.zhang0@gmail.com>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent c63bcc6f

arch/sh/boards/board-secureedge5410.c

+1 −2
Original line number Diff line number Diff line
@@ -41,8 +41,7 @@ static int __init eraseconfig_init(void) 
	printk("SnapGear: EraseConfig init\n");



	/* Setup "EraseConfig" switch on external IRQ 0 */

	if (request_irq(irq, eraseconfig_interrupt, IRQF_DISABLED,

				"Erase Config", NULL))

	if (request_irq(irq, eraseconfig_interrupt, 0, "Erase Config", NULL))

		printk("SnapGear: failed to register IRQ%d for Reset witch\n",

				irq);

	else

arch/sh/boards/mach-cayman/irq.c

+0 −2
Original line number Diff line number Diff line
@@ -46,13 +46,11 @@ static irqreturn_t cayman_interrupt_pci2(int irq, void *dev_id) 
static struct irqaction cayman_action_smsc = {

	.name		= "Cayman SMSC Mux",

	.handler	= cayman_interrupt_smsc,

	.flags		= IRQF_DISABLED,

};



static struct irqaction cayman_action_pci2 = {

	.name		= "Cayman PCI2 Mux",

	.handler	= cayman_interrupt_pci2,

	.flags		= IRQF_DISABLED,

};



static void enable_cayman_irq(struct irq_data *data)

arch/sh/boards/mach-hp6xx/hp6xx_apm.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static int __init hp6x0_apm_init(void) 
	int ret;



	ret = request_irq(HP680_BTN_IRQ, hp6x0_apm_interrupt,

			  IRQF_DISABLED, MODNAME, NULL);

			  0, MODNAME, NULL);

	if (unlikely(ret < 0)) {

		printk(KERN_ERR MODNAME ": IRQ %d request failed\n",

		       HP680_BTN_IRQ);

arch/sh/drivers/dma/dma-g2.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static int __init g2_dma_init(void) 
{

	int ret;



	ret = request_irq(HW_EVENT_G2_DMA, g2_dma_interrupt, IRQF_DISABLED,

	ret = request_irq(HW_EVENT_G2_DMA, g2_dma_interrupt, 0,

			  "g2 DMA handler", &g2_dma_info);

	if (unlikely(ret))

		return -EINVAL;

arch/sh/drivers/dma/dma-pvr2.c

+0 −1
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ static int pvr2_xfer_dma(struct dma_channel *chan) 
static struct irqaction pvr2_dma_irq = {

	.name		= "pvr2 DMA handler",

	.handler	= pvr2_dma_interrupt,

	.flags		= IRQF_DISABLED,

};



static struct dma_ops pvr2_dma_ops = {