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

Commit 8228a048 authored by Jiang Liu's avatar Jiang Liu Committed by Ingo Molnar
Browse files

sh/intc: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc 



Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc while we
already have a pointer to corresponding irq_desc.

Also replace generic_handle_irq with generic_handle_irq_desc() to avoid
looking up irq_desc again.

Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Cc: Simon Horman <horms@verge.net.au>
Cc: Magnus Damm <magnus.damm@gmail.com>
Link: http://lkml.kernel.org/r/20150713151626.792845830@linutronix.de


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 8b8149df

arch/sh/boards/mach-se/7343/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct irq_domain *se7343_irq_domain; 


static void se7343_irq_demux(unsigned int irq, struct irq_desc *desc)

{

	struct irq_data *data = irq_get_irq_data(irq);

	struct irq_data *data = irq_desc_get_irq_data(desc);

	struct irq_chip *chip = irq_data_get_irq_chip(data);

	unsigned long mask;

	int bit;

arch/sh/boards/mach-se/7722/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ struct irq_domain *se7722_irq_domain; 


static void se7722_irq_demux(unsigned int irq, struct irq_desc *desc)

{

	struct irq_data *data = irq_get_irq_data(irq);

	struct irq_data *data = irq_desc_get_irq_data(desc);

	struct irq_chip *chip = irq_data_get_irq_chip(data);

	unsigned long mask;

	int bit;

arch/sh/boards/mach-x3proto/gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static int x3proto_gpio_to_irq(struct gpio_chip *chip, unsigned gpio) 


static void x3proto_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)

{

	struct irq_data *data = irq_get_irq_data(irq);

	struct irq_data *data = irq_desc_get_irq_data(desc);

	struct irq_chip *chip = irq_data_get_irq_chip(data);

	unsigned long mask;

	int pin;

drivers/sh/intc/core.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ void intc_set_prio_level(unsigned int irq, unsigned int level) 


static void intc_redirect_irq(unsigned int irq, struct irq_desc *desc)

{

	generic_handle_irq((unsigned int)irq_get_handler_data(irq));

	generic_handle_irq((unsigned int)irq_desc_get_handler_data(desc));

}



static void __init intc_register_irq(struct intc_desc *desc,

drivers/sh/intc/virq.c

+8 −6
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static int add_virq_to_pirq(unsigned int irq, unsigned int virq) 


static void intc_virq_handler(unsigned int irq, struct irq_desc *desc)

{

	struct irq_data *data = irq_get_irq_data(irq);

	struct irq_data *data = irq_desc_get_irq_data(desc);

	struct irq_chip *chip = irq_data_get_irq_chip(data);

	struct intc_virq_list *entry, *vlist = irq_data_get_irq_handler_data(data);

	struct intc_desc_int *d = get_intc_desc(irq);
@@ -120,12 +120,14 @@ static void intc_virq_handler(unsigned int irq, struct irq_desc *desc) 


	for_each_virq(entry, vlist) {

		unsigned long addr, handle;

		struct irq_desc *vdesc = irq_to_desc(entry->irq);



		handle = (unsigned long)irq_get_handler_data(entry->irq);

		if (vdesc) {

			handle = (unsigned long)irq_desc_get_handler_data(vdesc);

			addr = INTC_REG(d, _INTC_ADDR_E(handle), 0);



			if (intc_reg_fns[_INTC_FN(handle)](addr, handle, 0))

			generic_handle_irq(entry->irq);

				generic_handle_irq_desc(entry->irq, vdesc);

		}

	}



	chip->irq_unmask(data);