lkml.org 
[lkml]   [2011]   [Sep]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/28] m68k/irq: Kill irq_node_t typedef, always use struct irq_node
    Date
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Acked-by: Thomas Gleixner <tglx@linutronix.de>
    ---
    arch/m68k/include/asm/irq.h | 8 ++++----
    arch/m68k/kernel/ints.c | 6 +++---
    2 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/arch/m68k/include/asm/irq.h b/arch/m68k/include/asm/irq.h
    index d8c6f68..bfc521f 100644
    --- a/arch/m68k/include/asm/irq.h
    +++ b/arch/m68k/include/asm/irq.h
    @@ -75,13 +75,13 @@ struct pt_regs;
    * This structure is used to chain together the ISRs for a particular
    * interrupt source (if it supports chaining).
    */
    -typedef struct irq_node {
    +struct irq_node {
    irqreturn_t (*handler)(int, void *);
    void *dev_id;
    struct irq_node *next;
    unsigned long flags;
    const char *devname;
    -} irq_node_t;
    +};

    /*
    * This structure has only 4 elements for speed reasons
    @@ -105,9 +105,9 @@ extern unsigned int m68k_irq_startup(unsigned int);
    extern void m68k_irq_shutdown(unsigned int);

    /*
    - * This function returns a new irq_node_t
    + * This function returns a new struct irq_node
    */
    -extern irq_node_t *new_irq_node(void);
    +extern struct irq_node *new_irq_node(void);

    extern void m68k_setup_auto_interrupt(void (*handler)(unsigned int, struct pt_regs *));
    extern void m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt,
    diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c
    index f43ad7b..9de8eb4 100644
    --- a/arch/m68k/kernel/ints.c
    +++ b/arch/m68k/kernel/ints.c
    @@ -70,7 +70,7 @@ static struct irq_chip user_irq_chip = {
    };

    #define NUM_IRQ_NODES 100
    -static irq_node_t nodes[NUM_IRQ_NODES];
    +static struct irq_node nodes[NUM_IRQ_NODES];

    /*
    * void init_IRQ(void)
    @@ -160,9 +160,9 @@ void m68k_setup_irq_chip(struct irq_chip *contr, unsigned int irq,
    irq_chip[irq + i] = contr;
    }

    -irq_node_t *new_irq_node(void)
    +struct irq_node *new_irq_node(void)
    {
    - irq_node_t *node;
    + struct irq_node *node;
    short i;

    for (node = nodes, i = NUM_IRQ_NODES-1; i >= 0; node++, i--) {
    --
    1.7.0.4


    \
     
     \ /
      Last update: 2011-09-11 14:07    [W:0.024 / U:31.368 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site