Re: [patch 2/3] Scheduled removal of SA_xxx interrupt flags fixups

From: Ingo Molnar
Date: Sun Jan 14 2007 - 07:47:08 EST



* Thomas Gleixner <tglx@xxxxxxxxxxxxx> wrote:

> The obsolete SA_xxx interrupt flags have been used despite the
> scheduled removal. Fixup the remaining users.
>
> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>

i have tested your patch-queue ontop of rc4-mm1 (trivial reject fixups
are below), it builds and boots fine.

Acked-by: Ingo Molnar <mingo@xxxxxxx>

Ingo

---
drivers/char/nozomi.c | 2 +-
drivers/net/qla3xxx.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

Index: linux/drivers/char/nozomi.c
===================================================================
--- linux.orig/drivers/char/nozomi.c
+++ linux/drivers/char/nozomi.c
@@ -1378,7 +1378,7 @@ static int nozomi_setup_interrupt(struct
{
int rval;

- rval = request_irq(dc->pdev->irq, &interrupt_handler, SA_SHIRQ,
+ rval = request_irq(dc->pdev->irq, &interrupt_handler, IRQF_SHARED,
NOZOMI_NAME, dc);
if (rval)
dev_err(&dc->pdev->dev, "Cannot open because IRQ %d "
Index: linux/drivers/net/qla3xxx.c
===================================================================
--- linux.orig/drivers/net/qla3xxx.c
+++ linux/drivers/net/qla3xxx.c
@@ -2999,7 +2999,7 @@ static int ql_adapter_up(struct ql3_adap
{
struct net_device *ndev = qdev->ndev;
int err;
- unsigned long irq_flags = SA_SAMPLE_RANDOM | SA_SHIRQ;
+ unsigned long irq_flags = IRQF_SAMPLE_RANDOM | IRQF_SHARED;
unsigned long hw_flags;

if (ql_alloc_mem_resources(qdev)) {
@@ -3018,7 +3018,7 @@ static int ql_adapter_up(struct ql3_adap
} else {
printk(KERN_INFO PFX "%s: MSI Enabled...\n", qdev->ndev->name);
set_bit(QL_MSI_ENABLED,&qdev->flags);
- irq_flags &= ~SA_SHIRQ;
+ irq_flags &= ~IRQF_SHARED;
}
}

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/