lkml.org 
[lkml]   [2011]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] powerpc: rename get_irq_desc_data and get_irq_desc_chip
    These two functions disappeared in commit

    0c6f8a8b917ad361319c8ace3e9f28e69bfdb4c1
    "genirq: Remove compat code"

    but they still exist in qe_ic.h.
    This patch renames the function to their new names.

    Signed-off-by: Richard Cochran <richard.cochran@omicron.at>
    ---
    arch/powerpc/include/asm/qe_ic.h | 16 ++++++++--------
    1 files changed, 8 insertions(+), 8 deletions(-)

    diff --git a/arch/powerpc/include/asm/qe_ic.h b/arch/powerpc/include/asm/qe_ic.h
    index 9e2cb20..f706164 100644
    --- a/arch/powerpc/include/asm/qe_ic.h
    +++ b/arch/powerpc/include/asm/qe_ic.h
    @@ -81,7 +81,7 @@ int qe_ic_set_high_priority(unsigned int virq, unsigned int priority, int high);
    static inline void qe_ic_cascade_low_ipic(unsigned int irq,
    struct irq_desc *desc)
    {
    - struct qe_ic *qe_ic = get_irq_desc_data(desc);
    + struct qe_ic *qe_ic = irq_desc_get_handler_data(desc);
    unsigned int cascade_irq = qe_ic_get_low_irq(qe_ic);

    if (cascade_irq != NO_IRQ)
    @@ -91,7 +91,7 @@ static inline void qe_ic_cascade_low_ipic(unsigned int irq,
    static inline void qe_ic_cascade_high_ipic(unsigned int irq,
    struct irq_desc *desc)
    {
    - struct qe_ic *qe_ic = get_irq_desc_data(desc);
    + struct qe_ic *qe_ic = irq_desc_get_handler_data(desc);
    unsigned int cascade_irq = qe_ic_get_high_irq(qe_ic);

    if (cascade_irq != NO_IRQ)
    @@ -101,9 +101,9 @@ static inline void qe_ic_cascade_high_ipic(unsigned int irq,
    static inline void qe_ic_cascade_low_mpic(unsigned int irq,
    struct irq_desc *desc)
    {
    - struct qe_ic *qe_ic = get_irq_desc_data(desc);
    + struct qe_ic *qe_ic = irq_desc_get_handler_data(desc);
    unsigned int cascade_irq = qe_ic_get_low_irq(qe_ic);
    - struct irq_chip *chip = get_irq_desc_chip(desc);
    + struct irq_chip *chip = irq_desc_get_chip(desc);

    if (cascade_irq != NO_IRQ)
    generic_handle_irq(cascade_irq);
    @@ -114,9 +114,9 @@ static inline void qe_ic_cascade_low_mpic(unsigned int irq,
    static inline void qe_ic_cascade_high_mpic(unsigned int irq,
    struct irq_desc *desc)
    {
    - struct qe_ic *qe_ic = get_irq_desc_data(desc);
    + struct qe_ic *qe_ic = irq_desc_get_handler_data(desc);
    unsigned int cascade_irq = qe_ic_get_high_irq(qe_ic);
    - struct irq_chip *chip = get_irq_desc_chip(desc);
    + struct irq_chip *chip = irq_desc_get_chip(desc);

    if (cascade_irq != NO_IRQ)
    generic_handle_irq(cascade_irq);
    @@ -127,9 +127,9 @@ static inline void qe_ic_cascade_high_mpic(unsigned int irq,
    static inline void qe_ic_cascade_muxed_mpic(unsigned int irq,
    struct irq_desc *desc)
    {
    - struct qe_ic *qe_ic = get_irq_desc_data(desc);
    + struct qe_ic *qe_ic = irq_desc_get_handler_data(desc);
    unsigned int cascade_irq;
    - struct irq_chip *chip = get_irq_desc_chip(desc);
    + struct irq_chip *chip = irq_desc_get_chip(desc);

    cascade_irq = qe_ic_get_high_irq(qe_ic);
    if (cascade_irq == NO_IRQ)
    --
    1.7.0.4


    \
     
     \ /
      Last update: 2011-03-30 15:27    [W:0.028 / U:59.492 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site