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

Commit 4a87bac4 authored by Lennert Buytenhek's avatar Lennert Buytenhek
Browse files

ARM: ecard: irq_data conversion. 



Signed-off-by: default avatarLennert Buytenhek <buytenh@secretlab.ca>
Acked-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent f64305a6

arch/arm/kernel/ecard.c

+14 −14
Original line number Original line Diff line number Diff line
@@ -443,40 +443,40 @@ static expansioncard_ops_t ecard_default_ops = { 
 *

 *

 * They are not meant to be called directly, but via enable/disable_irq.

 * They are not meant to be called directly, but via enable/disable_irq.

 */

 */

static void ecard_irq_unmask(unsigned int irqnr)

static void ecard_irq_unmask(struct irq_data *d)

{

{

	ecard_t *ec = slot_to_ecard(irqnr - 32);

	ecard_t *ec = slot_to_ecard(d->irq - 32);





	if (ec) {

	if (ec) {

		if (!ec->ops)

		if (!ec->ops)

			ec->ops = &ecard_default_ops;

			ec->ops = &ecard_default_ops;





		if (ec->claimed && ec->ops->irqenable)

		if (ec->claimed && ec->ops->irqenable)

			ec->ops->irqenable(ec, irqnr);

			ec->ops->irqenable(ec, d->irq);

		else

		else

			printk(KERN_ERR "ecard: rejecting request to "

			printk(KERN_ERR "ecard: rejecting request to "

				"enable IRQs for %d\n", irqnr);

				"enable IRQs for %d\n", d->irq);

	}

	}

}

}





static void ecard_irq_mask(unsigned int irqnr)

static void ecard_irq_mask(struct irq_data *d)

{

{

	ecard_t *ec = slot_to_ecard(irqnr - 32);

	ecard_t *ec = slot_to_ecard(d->irq - 32);





	if (ec) {

	if (ec) {

		if (!ec->ops)

		if (!ec->ops)

			ec->ops = &ecard_default_ops;

			ec->ops = &ecard_default_ops;





		if (ec->ops && ec->ops->irqdisable)

		if (ec->ops && ec->ops->irqdisable)

			ec->ops->irqdisable(ec, irqnr);

			ec->ops->irqdisable(ec, d->irq);

	}

	}

}

}





static struct irq_chip ecard_chip = {

static struct irq_chip ecard_chip = {

	.name		= "ECARD",

	.name		= "ECARD",

	.ack	= ecard_irq_mask,

	.irq_ack	= ecard_irq_mask,

	.mask	= ecard_irq_mask,

	.irq_mask	= ecard_irq_mask,

	.unmask = ecard_irq_unmask,

	.irq_unmask	= ecard_irq_unmask,

};

};





void ecard_enablefiq(unsigned int fiqnr)

void ecard_enablefiq(unsigned int fiqnr)
@@ -551,7 +551,7 @@ static void ecard_check_lockup(struct irq_desc *desc) 
			printk(KERN_ERR "\nInterrupt lockup detected - "

			printk(KERN_ERR "\nInterrupt lockup detected - "

			       "disabling all expansion card interrupts\n");

			       "disabling all expansion card interrupts\n");





			desc->chip->mask(IRQ_EXPANSIONCARD);

			desc->irq_data.chip->irq_mask(&desc->irq_data);

			ecard_dump_irq_state();

			ecard_dump_irq_state();

		}

		}

	} else

	} else
@@ -574,7 +574,7 @@ ecard_irq_handler(unsigned int irq, struct irq_desc *desc) 
	ecard_t *ec;

	ecard_t *ec;

	int called = 0;

	int called = 0;





	desc->chip->mask(irq);

	desc->irq_data.chip->irq_mask(&desc->irq_data);

	for (ec = cards; ec; ec = ec->next) {

	for (ec = cards; ec; ec = ec->next) {

		int pending;

		int pending;
@@ -591,7 +591,7 @@ ecard_irq_handler(unsigned int irq, struct irq_desc *desc) 
			called ++;

			called ++;

		}

		}

	}

	}

	desc->chip->unmask(irq);

	desc->irq_data.chip->irq_unmask(&desc->irq_data);





	if (called == 0)

	if (called == 0)

		ecard_check_lockup(desc);

		ecard_check_lockup(desc);