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 03/15] [BLACKFIN] minor irq handler cleanups
    Date
    - time_sched_init() should use standard irq_handler_t

    - sys_timer0_int_handler() should not take 'regs' third argument

    - remove pointless cast from void*

    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>
    ---
    arch/blackfin/kernel/time.c | 5 ++---
    arch/blackfin/oprofile/timer_int.c | 5 ++---
    2 files changed, 4 insertions(+), 6 deletions(-)

    diff --git a/arch/blackfin/kernel/time.c b/arch/blackfin/kernel/time.c
    index 9bdc8f9..715b394 100644
    --- a/arch/blackfin/kernel/time.c
    +++ b/arch/blackfin/kernel/time.c
    @@ -39,8 +39,7 @@
    /* This is an NTP setting */
    #define TICK_SIZE (tick_nsec / 1000)

    -static void time_sched_init(irqreturn_t(*timer_routine)
    - (int, void *));
    +static void time_sched_init(irq_handler_t timer_routine);
    static unsigned long gettimeoffset(void);

    static struct irqaction bfin_timer_irq = {
    @@ -64,7 +63,7 @@ static struct irqaction bfin_timer_irq = {
    #define TIME_SCALE 1

    static void
    -time_sched_init(irqreturn_t(*timer_routine) (int, void *))
    +time_sched_init(irq_handler_t timer_routine)
    {
    u32 tcount;

    diff --git a/arch/blackfin/oprofile/timer_int.c b/arch/blackfin/oprofile/timer_int.c
    index 6c6f860..e2c825a 100644
    --- a/arch/blackfin/oprofile/timer_int.c
    +++ b/arch/blackfin/oprofile/timer_int.c
    @@ -40,10 +40,9 @@ static void disable_sys_timer0()
    {
    }

    -static irqreturn_t sys_timer0_int_handler(int irq, void *dev_id,
    - struct pt_regs *regs)
    +static irqreturn_t sys_timer0_int_handler(int irq, void *dev_id)
    {
    - oprofile_add_sample(regs, 0);
    + oprofile_add_sample(get_irq_regs(), 0);
    return IRQ_HANDLED;
    }

    --
    1.5.4.1


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