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

Commit 42a07ae2 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Benjamin Herrenschmidt
Browse files

powerpc: sysdev/uic irq_data conversion. 



Signed-off-by: default avatarLennert Buytenhek <buytenh@secretlab.ca>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 11afe2bd

arch/powerpc/sysdev/uic.c

+30 −29
Original line number Diff line number Diff line
@@ -55,11 +55,11 @@ struct uic { 
	struct irq_host	*irqhost;

};



static void uic_unmask_irq(unsigned int virq)

static void uic_unmask_irq(struct irq_data *d)

{

	struct irq_desc *desc = irq_to_desc(virq);

	struct uic *uic = get_irq_chip_data(virq);

	unsigned int src = uic_irq_to_hw(virq);

	struct irq_desc *desc = irq_to_desc(d->irq);

	struct uic *uic = irq_data_get_irq_chip_data(d);

	unsigned int src = uic_irq_to_hw(d->irq);

	unsigned long flags;

	u32 er, sr;
@@ -74,10 +74,10 @@ static void uic_unmask_irq(unsigned int virq) 
	spin_unlock_irqrestore(&uic->lock, flags);

}



static void uic_mask_irq(unsigned int virq)

static void uic_mask_irq(struct irq_data *d)

{

	struct uic *uic = get_irq_chip_data(virq);

	unsigned int src = uic_irq_to_hw(virq);

	struct uic *uic = irq_data_get_irq_chip_data(d);

	unsigned int src = uic_irq_to_hw(d->irq);

	unsigned long flags;

	u32 er;
@@ -88,10 +88,10 @@ static void uic_mask_irq(unsigned int virq) 
	spin_unlock_irqrestore(&uic->lock, flags);

}



static void uic_ack_irq(unsigned int virq)

static void uic_ack_irq(struct irq_data *d)

{

	struct uic *uic = get_irq_chip_data(virq);

	unsigned int src = uic_irq_to_hw(virq);

	struct uic *uic = irq_data_get_irq_chip_data(d);

	unsigned int src = uic_irq_to_hw(d->irq);

	unsigned long flags;



	spin_lock_irqsave(&uic->lock, flags);
@@ -99,11 +99,11 @@ static void uic_ack_irq(unsigned int virq) 
	spin_unlock_irqrestore(&uic->lock, flags);

}



static void uic_mask_ack_irq(unsigned int virq)

static void uic_mask_ack_irq(struct irq_data *d)

{

	struct irq_desc *desc = irq_to_desc(virq);

	struct uic *uic = get_irq_chip_data(virq);

	unsigned int src = uic_irq_to_hw(virq);

	struct irq_desc *desc = irq_to_desc(d->irq);

	struct uic *uic = irq_data_get_irq_chip_data(d);

	unsigned int src = uic_irq_to_hw(d->irq);

	unsigned long flags;

	u32 er, sr;
@@ -125,18 +125,18 @@ static void uic_mask_ack_irq(unsigned int virq) 
	spin_unlock_irqrestore(&uic->lock, flags);

}



static int uic_set_irq_type(unsigned int virq, unsigned int flow_type)

static int uic_set_irq_type(struct irq_data *d, unsigned int flow_type)

{

	struct uic *uic = get_irq_chip_data(virq);

	unsigned int src = uic_irq_to_hw(virq);

	struct irq_desc *desc = irq_to_desc(virq);

	struct uic *uic = irq_data_get_irq_chip_data(d);

	unsigned int src = uic_irq_to_hw(d->irq);

	struct irq_desc *desc = irq_to_desc(d->irq);

	unsigned long flags;

	int trigger, polarity;

	u32 tr, pr, mask;



	switch (flow_type & IRQ_TYPE_SENSE_MASK) {

	case IRQ_TYPE_NONE:

		uic_mask_irq(virq);

		uic_mask_irq(d);

		return 0;



	case IRQ_TYPE_EDGE_RISING:
@@ -178,11 +178,11 @@ static int uic_set_irq_type(unsigned int virq, unsigned int flow_type) 


static struct irq_chip uic_irq_chip = {

	.name		= "UIC",

	.unmask		= uic_unmask_irq,

	.mask		= uic_mask_irq,

 	.mask_ack	= uic_mask_ack_irq,

	.ack		= uic_ack_irq,

	.set_type	= uic_set_irq_type,

	.irq_unmask	= uic_unmask_irq,

	.irq_mask	= uic_mask_irq,

	.irq_mask_ack	= uic_mask_ack_irq,

	.irq_ack	= uic_ack_irq,

	.irq_set_type	= uic_set_irq_type,

};



static int uic_host_map(struct irq_host *h, unsigned int virq,
@@ -220,6 +220,7 @@ static struct irq_host_ops uic_host_ops = { 


void uic_irq_cascade(unsigned int virq, struct irq_desc *desc)

{

	struct irq_chip *chip = get_irq_desc_chip(desc);

	struct uic *uic = get_irq_data(virq);

	u32 msr;

	int src;
@@ -227,9 +228,9 @@ void uic_irq_cascade(unsigned int virq, struct irq_desc *desc) 


	raw_spin_lock(&desc->lock);

	if (desc->status & IRQ_LEVEL)

		desc->chip->mask(virq);

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

	else

		desc->chip->mask_ack(virq);

		chip->irq_mask_ack(&desc->irq_data);

	raw_spin_unlock(&desc->lock);



	msr = mfdcr(uic->dcrbase + UIC_MSR);
@@ -244,9 +245,9 @@ void uic_irq_cascade(unsigned int virq, struct irq_desc *desc) 
uic_irq_ret:

	raw_spin_lock(&desc->lock);

	if (desc->status & IRQ_LEVEL)

		desc->chip->ack(virq);

	if (!(desc->status & IRQ_DISABLED) && desc->chip->unmask)

		desc->chip->unmask(virq);

		chip->irq_ack(&desc->irq_data);

	if (!(desc->status & IRQ_DISABLED) && chip->irq_unmask)

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

	raw_spin_unlock(&desc->lock);

}