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: Yong Zhang <yong.zhang0@gmail.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
parent
c63bcc6ff1
commit
d11584a044
|
@ -41,8 +41,7 @@ static int __init eraseconfig_init(void)
|
||||||
printk("SnapGear: EraseConfig init\n");
|
printk("SnapGear: EraseConfig init\n");
|
||||||
|
|
||||||
/* Setup "EraseConfig" switch on external IRQ 0 */
|
/* Setup "EraseConfig" switch on external IRQ 0 */
|
||||||
if (request_irq(irq, eraseconfig_interrupt, IRQF_DISABLED,
|
if (request_irq(irq, eraseconfig_interrupt, 0, "Erase Config", NULL))
|
||||||
"Erase Config", NULL))
|
|
||||||
printk("SnapGear: failed to register IRQ%d for Reset witch\n",
|
printk("SnapGear: failed to register IRQ%d for Reset witch\n",
|
||||||
irq);
|
irq);
|
||||||
else
|
else
|
||||||
|
|
|
@ -46,13 +46,11 @@ static irqreturn_t cayman_interrupt_pci2(int irq, void *dev_id)
|
||||||
static struct irqaction cayman_action_smsc = {
|
static struct irqaction cayman_action_smsc = {
|
||||||
.name = "Cayman SMSC Mux",
|
.name = "Cayman SMSC Mux",
|
||||||
.handler = cayman_interrupt_smsc,
|
.handler = cayman_interrupt_smsc,
|
||||||
.flags = IRQF_DISABLED,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct irqaction cayman_action_pci2 = {
|
static struct irqaction cayman_action_pci2 = {
|
||||||
.name = "Cayman PCI2 Mux",
|
.name = "Cayman PCI2 Mux",
|
||||||
.handler = cayman_interrupt_pci2,
|
.handler = cayman_interrupt_pci2,
|
||||||
.flags = IRQF_DISABLED,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static void enable_cayman_irq(struct irq_data *data)
|
static void enable_cayman_irq(struct irq_data *data)
|
||||||
|
|
|
@ -86,7 +86,7 @@ static int __init hp6x0_apm_init(void)
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = request_irq(HP680_BTN_IRQ, hp6x0_apm_interrupt,
|
ret = request_irq(HP680_BTN_IRQ, hp6x0_apm_interrupt,
|
||||||
IRQF_DISABLED, MODNAME, NULL);
|
0, MODNAME, NULL);
|
||||||
if (unlikely(ret < 0)) {
|
if (unlikely(ret < 0)) {
|
||||||
printk(KERN_ERR MODNAME ": IRQ %d request failed\n",
|
printk(KERN_ERR MODNAME ": IRQ %d request failed\n",
|
||||||
HP680_BTN_IRQ);
|
HP680_BTN_IRQ);
|
||||||
|
|
|
@ -170,7 +170,7 @@ static int __init g2_dma_init(void)
|
||||||
{
|
{
|
||||||
int ret;
|
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);
|
"g2 DMA handler", &g2_dma_info);
|
||||||
if (unlikely(ret))
|
if (unlikely(ret))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
|
@ -70,7 +70,6 @@ static int pvr2_xfer_dma(struct dma_channel *chan)
|
||||||
static struct irqaction pvr2_dma_irq = {
|
static struct irqaction pvr2_dma_irq = {
|
||||||
.name = "pvr2 DMA handler",
|
.name = "pvr2 DMA handler",
|
||||||
.handler = pvr2_dma_interrupt,
|
.handler = pvr2_dma_interrupt,
|
||||||
.flags = IRQF_DISABLED,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct dma_ops pvr2_dma_ops = {
|
static struct dma_ops pvr2_dma_ops = {
|
||||||
|
|
|
@ -95,7 +95,7 @@ static int sh_dmac_request_dma(struct dma_channel *chan)
|
||||||
#if defined(CONFIG_SH_DMA_IRQ_MULTI)
|
#if defined(CONFIG_SH_DMA_IRQ_MULTI)
|
||||||
IRQF_SHARED,
|
IRQF_SHARED,
|
||||||
#else
|
#else
|
||||||
IRQF_DISABLED,
|
0,
|
||||||
#endif
|
#endif
|
||||||
chan->dev_id, chan);
|
chan->dev_id, chan);
|
||||||
}
|
}
|
||||||
|
@ -305,7 +305,7 @@ static int __init sh_dmac_init(void)
|
||||||
#if defined(CONFIG_SH_DMA_IRQ_MULTI)
|
#if defined(CONFIG_SH_DMA_IRQ_MULTI)
|
||||||
IRQF_SHARED,
|
IRQF_SHARED,
|
||||||
#else
|
#else
|
||||||
IRQF_DISABLED,
|
0,
|
||||||
#endif
|
#endif
|
||||||
dmae_name[n], (void *)dmae_name[n]);
|
dmae_name[n], (void *)dmae_name[n]);
|
||||||
if (unlikely(i < 0)) {
|
if (unlikely(i < 0)) {
|
||||||
|
|
|
@ -174,17 +174,17 @@ static int __init dmabrg_init(void)
|
||||||
or = __raw_readl(DMAOR);
|
or = __raw_readl(DMAOR);
|
||||||
__raw_writel(or | DMAOR_BRG | DMAOR_DMEN, DMAOR);
|
__raw_writel(or | DMAOR_BRG | DMAOR_DMEN, DMAOR);
|
||||||
|
|
||||||
ret = request_irq(DMABRGI0, dmabrg_irq, IRQF_DISABLED,
|
ret = request_irq(DMABRGI0, dmabrg_irq, 0,
|
||||||
"DMABRG USB address error", NULL);
|
"DMABRG USB address error", NULL);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out0;
|
goto out0;
|
||||||
|
|
||||||
ret = request_irq(DMABRGI1, dmabrg_irq, IRQF_DISABLED,
|
ret = request_irq(DMABRGI1, dmabrg_irq, 0,
|
||||||
"DMABRG Transfer End", NULL);
|
"DMABRG Transfer End", NULL);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out1;
|
goto out1;
|
||||||
|
|
||||||
ret = request_irq(DMABRGI2, dmabrg_irq, IRQF_DISABLED,
|
ret = request_irq(DMABRGI2, dmabrg_irq, 0,
|
||||||
"DMABRG Transfer Half", NULL);
|
"DMABRG Transfer Half", NULL);
|
||||||
if (ret == 0)
|
if (ret == 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
|
@ -107,13 +107,13 @@ static int __init sh5pci_init(void)
|
||||||
u32 uval;
|
u32 uval;
|
||||||
|
|
||||||
if (request_irq(IRQ_ERR, pcish5_err_irq,
|
if (request_irq(IRQ_ERR, pcish5_err_irq,
|
||||||
IRQF_DISABLED, "PCI Error",NULL) < 0) {
|
0, "PCI Error",NULL) < 0) {
|
||||||
printk(KERN_ERR "PCISH5: Cannot hook PCI_PERR interrupt\n");
|
printk(KERN_ERR "PCISH5: Cannot hook PCI_PERR interrupt\n");
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (request_irq(IRQ_SERR, pcish5_serr_irq,
|
if (request_irq(IRQ_SERR, pcish5_serr_irq,
|
||||||
IRQF_DISABLED, "PCI SERR interrupt", NULL) < 0) {
|
0, "PCI SERR interrupt", NULL) < 0) {
|
||||||
printk(KERN_ERR "PCISH5: Cannot hook PCI_SERR interrupt\n");
|
printk(KERN_ERR "PCISH5: Cannot hook PCI_SERR interrupt\n");
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
|
@ -172,7 +172,7 @@ static int __init sh7780_pci_setup_irqs(struct pci_channel *hose)
|
||||||
PCI_STATUS_SIG_TARGET_ABORT | \
|
PCI_STATUS_SIG_TARGET_ABORT | \
|
||||||
PCI_STATUS_PARITY, hose->reg_base + PCI_STATUS);
|
PCI_STATUS_PARITY, hose->reg_base + PCI_STATUS);
|
||||||
|
|
||||||
ret = request_irq(hose->serr_irq, sh7780_pci_serr_irq, IRQF_DISABLED,
|
ret = request_irq(hose->serr_irq, sh7780_pci_serr_irq, 0,
|
||||||
"PCI SERR interrupt", hose);
|
"PCI SERR interrupt", hose);
|
||||||
if (unlikely(ret)) {
|
if (unlikely(ret)) {
|
||||||
printk(KERN_ERR "PCI: Failed hooking SERR IRQ\n");
|
printk(KERN_ERR "PCI: Failed hooking SERR IRQ\n");
|
||||||
|
|
|
@ -63,7 +63,7 @@ static int switch_drv_probe(struct platform_device *pdev)
|
||||||
BUG_ON(!psw_info);
|
BUG_ON(!psw_info);
|
||||||
|
|
||||||
ret = request_irq(irq, psw_info->irq_handler,
|
ret = request_irq(irq, psw_info->irq_handler,
|
||||||
IRQF_DISABLED | psw_info->irq_flags,
|
psw_info->irq_flags,
|
||||||
psw_info->name ? psw_info->name : DRV_NAME, pdev);
|
psw_info->name ? psw_info->name : DRV_NAME, pdev);
|
||||||
if (unlikely(ret < 0))
|
if (unlikely(ret < 0))
|
||||||
goto err;
|
goto err;
|
||||||
|
|
|
@ -79,7 +79,7 @@ static void shx3_prepare_cpus(unsigned int max_cpus)
|
||||||
|
|
||||||
for (i = 0; i < SMP_MSG_NR; i++)
|
for (i = 0; i < SMP_MSG_NR; i++)
|
||||||
request_irq(104 + i, ipi_interrupt_handler,
|
request_irq(104 + i, ipi_interrupt_handler,
|
||||||
IRQF_DISABLED | IRQF_PERCPU, "IPI", (void *)(long)i);
|
IRQF_PERCPU, "IPI", (void *)(long)i);
|
||||||
|
|
||||||
for (i = 0; i < max_cpus; i++)
|
for (i = 0; i < max_cpus; i++)
|
||||||
set_cpu_present(i, true);
|
set_cpu_present(i, true);
|
||||||
|
|
Reference in New Issue