lkml.org 
[lkml]   [2012]   [Jan]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC 03/14] irq_domain: convert microblaze from irq_host to irq_domain
    Date
    Trivial change, microblaze doesn't use irq remapping yet.

    Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
    Cc: Michal Simek <monstr@monstr.eu>
    ---
    arch/microblaze/include/asm/irq.h | 4 ++--
    arch/microblaze/kernel/irq.c | 2 +-
    arch/microblaze/kernel/setup.c | 2 --
    3 files changed, 3 insertions(+), 5 deletions(-)

    diff --git a/arch/microblaze/include/asm/irq.h b/arch/microblaze/include/asm/irq.h
    index a175132..7798ad1 100644
    --- a/arch/microblaze/include/asm/irq.h
    +++ b/arch/microblaze/include/asm/irq.h
    @@ -39,7 +39,7 @@ static inline void irq_dispose_mapping(unsigned int virq)
    return;
    }

    -struct irq_host;
    +struct irq_domain;

    /**
    * irq_create_mapping - Map a hardware interrupt into linux virq space
    @@ -51,7 +51,7 @@ struct irq_host;
    * If the sense/trigger is to be specified, set_irq_type() should be called
    * on the number returned from that call.
    */
    -extern unsigned int irq_create_mapping(struct irq_host *host,
    +extern unsigned int irq_create_mapping(struct irq_domain *host,
    irq_hw_number_t hwirq);

    #endif /* _ASM_MICROBLAZE_IRQ_H */
    diff --git a/arch/microblaze/kernel/irq.c b/arch/microblaze/kernel/irq.c
    index bbebcae..3f613df 100644
    --- a/arch/microblaze/kernel/irq.c
    +++ b/arch/microblaze/kernel/irq.c
    @@ -51,7 +51,7 @@ next_irq:

    /* MS: There is no any advance mapping mechanism. We are using simple 32bit
    intc without any cascades or any connection that's why mapping is 1:1 */
    -unsigned int irq_create_mapping(struct irq_host *host, irq_hw_number_t hwirq)
    +unsigned int irq_create_mapping(struct irq_domain *host, irq_hw_number_t hwirq)
    {
    return hwirq + IRQ_OFFSET;
    }
    diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c
    index 604cd9d..70e6d0b 100644
    --- a/arch/microblaze/kernel/setup.c
    +++ b/arch/microblaze/kernel/setup.c
    @@ -51,8 +51,6 @@ void __init setup_arch(char **cmdline_p)

    unflatten_device_tree();

    - /* NOTE I think that this function is not necessary to call */
    - /* irq_early_init(); */
    setup_cpuinfo();

    microblaze_cache_init();
    --
    1.7.5.4


    \
     
     \ /
      Last update: 2012-01-11 21:29    [W:0.023 / U:0.188 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site