synclink_cs 2.6.11 diff

[Marcelo Tosatti]

Hi folks,

While wandering through the 2.6.11 diff I've noticed:

diff -Nru a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
--- a/drivers/char/pcmcia/synclink_cs.c 2005-03-01 23:38:55 -08:00
+++ b/drivers/char/pcmcia/synclink_cs.c 2005-03-01 23:38:55 -08:00
@@ -592,11 +582,6 @@
     /* Interrupt setup */
     link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
     link->irq.IRQInfo1   = IRQ_INFO2_VALID | IRQ_LEVEL_ID;
-    if (irq_list[0] == -1)
-           link->irq.IRQInfo2 = irq_mask;
-    else
-           for (i = 0; i < 4; i++)
-                   link->irq.IRQInfo2 |= 1 << irq_list[i];
     link->irq.Handler = NULL;
                                                                                        
     link->conf.Attributes = 0;
@@ -608,7 +593,6 @@


Isnt the patch supposed to remove "IRQ_INFO2_VALID" from the link->irq.IRQInfo1
assignment ? 

On a related note, isnt drivers/pcmcia/cistpl.c parse_irq() function handling
of IRQ_INFO2_VALID now obsolete? 

static u_char *parse_irq(u_char *p, u_char *q, cistpl_irq_t *irq)
{
    if (p == q) return NULL;
    irq->IRQInfo1 = *p; p++;
    if (irq->IRQInfo1 & IRQ_INFO2_VALID) {
        if (p+2 > q) return NULL;
        irq->IRQInfo2 = (p[1]<<8) + p[0];
        p += 2;
    }
    return p;
}