lkml.org 
[lkml]   [2008]   [Apr]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/15] [ISDN] minor irq handler cleanups
    Date
    - remove pointless casts from void*

    - remove braces around singleton C statements

    - remove unused 'intno' argument from rs_interrupt_elsa()

    - cs->irq_func() should be defined using standard irq_handler_t

    This change's main purpose is to prepare for the patchset in
    jgarzik/misc-2.6.git#irq-remove, that explores removal of the
    never-used 'irq' argument in each interrupt handler.

    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
    ---
    drivers/isdn/hisax/elsa.c | 4 ++--
    drivers/isdn/hisax/elsa_ser.c | 4 ++--
    drivers/isdn/hisax/hisax.h | 2 +-
    3 files changed, 5 insertions(+), 5 deletions(-)

    diff --git a/drivers/isdn/hisax/elsa.c b/drivers/isdn/hisax/elsa.c
    index d272d8c..2c3691f 100644
    --- a/drivers/isdn/hisax/elsa.c
    +++ b/drivers/isdn/hisax/elsa.c
    @@ -299,7 +299,7 @@ elsa_interrupt(int intno, void *dev_id)
    val = serial_inp(cs, UART_IIR);
    if (!(val & UART_IIR_NO_INT)) {
    debugl1(cs,"IIR %02x", val);
    - rs_interrupt_elsa(intno, cs);
    + rs_interrupt_elsa(cs);
    }
    }
    #endif
    @@ -379,7 +379,7 @@ elsa_interrupt_ipac(int intno, void *dev_id)
    val = serial_inp(cs, UART_IIR);
    if (!(val & UART_IIR_NO_INT)) {
    debugl1(cs,"IIR %02x", val);
    - rs_interrupt_elsa(intno, cs);
    + rs_interrupt_elsa(cs);
    }
    }
    #endif
    diff --git a/drivers/isdn/hisax/elsa_ser.c b/drivers/isdn/hisax/elsa_ser.c
    index 1642dca..f181db4 100644
    --- a/drivers/isdn/hisax/elsa_ser.c
    +++ b/drivers/isdn/hisax/elsa_ser.c
    @@ -384,13 +384,13 @@ static inline void transmit_chars(struct IsdnCardState *cs, int *intr_done)
    }


    -static void rs_interrupt_elsa(int irq, struct IsdnCardState *cs)
    +static void rs_interrupt_elsa(struct IsdnCardState *cs)
    {
    int status, iir, msr;
    int pass_counter = 0;

    #ifdef SERIAL_DEBUG_INTR
    - printk("rs_interrupt_single(%d)...", irq);
    + printk(KERN_DEBUG "rs_interrupt_single(%d)...", cs->irq);
    #endif

    do {
    diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h
    index 34733c9..e8d429f 100644
    --- a/drivers/isdn/hisax/hisax.h
    +++ b/drivers/isdn/hisax/hisax.h
    @@ -925,7 +925,7 @@ struct IsdnCardState {
    int (*cardmsg) (struct IsdnCardState *, int, void *);
    void (*setstack_d) (struct PStack *, struct IsdnCardState *);
    void (*DC_Close) (struct IsdnCardState *);
    - int (*irq_func) (int, void *);
    + irq_handler_t irq_func;
    int (*auxcmd) (struct IsdnCardState *, isdn_ctrl *);
    struct Channel channel[2+MAX_WAITING_CALLS];
    struct BCState bcs[2+MAX_WAITING_CALLS];
    --
    1.5.4.1


    \
     
     \ /
      Last update: 2008-04-19 01:27    [W:0.020 / U:63.684 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site