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

Commit d8aa0251 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Russell King
Browse files

[ARM] 5298/1: Drop desc_handle_irq() 



desc_handle_irq() was declared as obsolete since long ago.
Replace it with generic_handle_irq()

Signed-off-by: default avatarDmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 27c4cae2

arch/arm/common/it8152.c

+3 −11
Original line number Diff line number Diff line
@@ -66,14 +66,6 @@ static void it8152_unmask_irq(unsigned int irq) 
       }

}



static inline void it8152_irq(int irq)

{

	struct irq_desc *desc;



	desc = irq_desc + irq;

	desc_handle_irq(irq, desc);

}



static struct irq_chip it8152_irq_chip = {

	.name		= "it8152",

	.ack		= it8152_mask_irq,
@@ -128,21 +120,21 @@ void it8152_irq_demux(unsigned int irq, struct irq_desc *desc) 
	       bits_pd &= ((1 << IT8152_PD_IRQ_COUNT) - 1);

	       while (bits_pd) {

		       i = __ffs(bits_pd);

		       it8152_irq(IT8152_PD_IRQ(i));

		       generic_handle_irq(IT8152_PD_IRQ(i));

		       bits_pd &= ~(1 << i);

	       }



	       bits_lp &= ((1 << IT8152_LP_IRQ_COUNT) - 1);

	       while (bits_lp) {

		       i = __ffs(bits_lp);

		       it8152_irq(IT8152_LP_IRQ(i));

		       generic_handle_irq(IT8152_LP_IRQ(i));

		       bits_lp &= ~(1 << i);

	       }



	       bits_ld &= ((1 << IT8152_LD_IRQ_COUNT) - 1);

	       while (bits_ld) {

		       i = __ffs(bits_ld);

		       it8152_irq(IT8152_LD_IRQ(i));

		       generic_handle_irq(IT8152_LD_IRQ(i));

		       bits_ld &= ~(1 << i);

	       }

       }

arch/arm/common/locomo.c

+8 −18
Original line number Diff line number Diff line
@@ -169,7 +169,6 @@ static struct locomo_dev_info locomo_devices[] = { 
static void locomo_handler(unsigned int irq, struct irq_desc *desc)

{

	int req, i;

	struct irq_desc *d;

	void __iomem *mapbase = get_irq_chip_data(irq);



	/* Acknowledge the parent IRQ */
@@ -181,10 +180,9 @@ static void locomo_handler(unsigned int irq, struct irq_desc *desc) 
	if (req) {

		/* generate the next interrupt(s) */

		irq = LOCOMO_IRQ_START;

		d = irq_desc + irq;

		for (i = 0; i <= 3; i++, d++, irq++) {

		for (i = 0; i <= 3; i++, irq++) {

			if (req & (0x0100 << i)) {

				desc_handle_irq(irq, d);

				generic_handle_irq(irq);

			}



		}
@@ -222,12 +220,10 @@ static struct irq_chip locomo_chip = { 


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

{

	struct irq_desc *d;

	void __iomem *mapbase = get_irq_chip_data(irq);



	if (locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC) & 0x0001) {

		d = irq_desc + LOCOMO_IRQ_KEY_START;

		desc_handle_irq(LOCOMO_IRQ_KEY_START, d);

		generic_handle_irq(LOCOMO_IRQ_KEY_START);

	}

}
@@ -268,7 +264,6 @@ static struct irq_chip locomo_key_chip = { 
static void locomo_gpio_handler(unsigned int irq, struct irq_desc *desc)

{

	int req, i;

	struct irq_desc *d;

	void __iomem *mapbase = get_irq_chip_data(irq);



	req = 	locomo_readl(mapbase + LOCOMO_GIR) &
@@ -277,10 +272,9 @@ static void locomo_gpio_handler(unsigned int irq, struct irq_desc *desc) 


	if (req) {

		irq = LOCOMO_IRQ_GPIO_START;

		d = irq_desc + LOCOMO_IRQ_GPIO_START;

		for (i = 0; i <= 15; i++, irq++, d++) {

		for (i = 0; i <= 15; i++, irq++) {

			if (req & (0x0001 << i)) {

				desc_handle_irq(irq, d);

				generic_handle_irq(irq);

			}

		}

	}
@@ -361,12 +355,10 @@ static struct irq_chip locomo_gpio_chip = { 


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

{

	struct irq_desc *d;

	void __iomem *mapbase = get_irq_chip_data(irq);



	if (locomo_readl(mapbase + LOCOMO_LTINT) & 0x0001) {

		d = irq_desc + LOCOMO_IRQ_LT_START;

		desc_handle_irq(LOCOMO_IRQ_LT_START, d);

		generic_handle_irq(LOCOMO_IRQ_LT_START);

	}

}
@@ -407,17 +399,15 @@ static struct irq_chip locomo_lt_chip = { 
static void locomo_spi_handler(unsigned int irq, struct irq_desc *desc)

{

	int req, i;

	struct irq_desc *d;

	void __iomem *mapbase = get_irq_chip_data(irq);



	req = locomo_readl(mapbase + LOCOMO_SPI + LOCOMO_SPIIR) & 0x000F;

	if (req) {

		irq = LOCOMO_IRQ_SPI_START;

		d = irq_desc + irq;



		for (i = 0; i <= 3; i++, irq++, d++) {

		for (i = 0; i <= 3; i++, irq++) {

			if (req & (0x0001 << i)) {

				desc_handle_irq(irq, d);

				generic_handle_irq(irq);

			}

		}

	}

arch/arm/kernel/ecard.c

+2 −4
Original line number Diff line number Diff line
@@ -587,8 +587,7 @@ ecard_irq_handler(unsigned int irq, struct irq_desc *desc) 
			pending = ecard_default_ops.irqpending(ec);



		if (pending) {

			struct irq_desc *d = irq_desc + ec->irq;

			desc_handle_irq(ec->irq, d);

			generic_handle_irq(ec->irq);

			called ++;

		}

	}
@@ -622,7 +621,6 @@ ecard_irqexp_handler(unsigned int irq, struct irq_desc *desc) 
		ecard_t *ec = slot_to_ecard(slot);



		if (ec->claimed) {

			struct irq_desc *d = irq_desc + ec->irq;

			/*

			 * this ugly code is so that we can operate a

			 * prioritorising system:
@@ -635,7 +633,7 @@ ecard_irqexp_handler(unsigned int irq, struct irq_desc *desc) 
			 * Serial cards should go in 0/1, ethernet/scsi in 2/3

			 * otherwise you will lose serial data at high speeds!

			 */

			desc_handle_irq(ec->irq, d);

			generic_handle_irq(ec->irq);

		} else {

			printk(KERN_WARNING "card%d: interrupt from unclaimed "

			       "card???\n", slot);

arch/arm/kernel/irq.c

+5 −6
Original line number Diff line number Diff line
@@ -112,18 +112,17 @@ static struct irq_desc bad_irq_desc = { 
asmlinkage void __exception asm_do_IRQ(unsigned int irq, struct pt_regs *regs)

{

	struct pt_regs *old_regs = set_irq_regs(regs);

	struct irq_desc *desc = irq_desc + irq;



	irq_enter();



	/*

	 * Some hardware gives randomly wrong interrupts.  Rather

	 * than crashing, do something sensible.

	 */

	if (irq >= NR_IRQS)

		desc = &bad_irq_desc;



	irq_enter();



	desc_handle_irq(irq, desc);

		handle_bad_irq(irq, &bad_irq_desc);

	else

		generic_handle_irq(irq);



	/* AT91 specific workaround */

	irq_finish(irq);

arch/arm/mach-at91/gpio.c

+1 −2
Original line number Diff line number Diff line
@@ -404,7 +404,6 @@ static void gpio_irq_handler(unsigned irq, struct irq_desc *desc) 
		}



		pin = bank->chipbase;

		gpio = &irq_desc[pin];



		while (isr) {

			if (isr & 1) {
@@ -417,7 +416,7 @@ static void gpio_irq_handler(unsigned irq, struct irq_desc *desc) 
					gpio_irq_mask(pin);

				}

				else

					desc_handle_irq(pin, gpio);

					generic_handle_irq(pin);

			}

			pin++;

			gpio++;