Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eead4d5c authored by Richard Cochran's avatar Richard Cochran Committed by Thomas Gleixner
Browse files

powerpc: qe_ic: Rename get_irq_desc_data and get_irq_desc_chip 



These two functions disappeared in commit

    0c6f8a8b
    "genirq: Remove compat code"

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

Signed-off-by: default avatarRichard Cochran <richard.cochran@omicron.at>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Lennert Buytenhek <buytenh@secretlab.ca>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
LKML-Reference: <20110330132504.GA31832@riccoc20.at.omicron.at>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 78c89825

arch/powerpc/include/asm/qe_ic.h

+8 −8
Original line number Diff line number Diff line
@@ -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)