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

Commit cf8d1581 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

arm: msm: Convert to new irq chip functions 



Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 1b7a2d90

arch/arm/mach-msm/gpio-v2.c

+17 −16
Original line number Diff line number Diff line
@@ -230,18 +230,18 @@ static void msm_gpio_update_dual_edge_pos(unsigned gpio) 
	       val, val2);

}



static void msm_gpio_irq_ack(unsigned int irq)

static void msm_gpio_irq_ack(struct irq_data *d)

{

	int gpio = msm_irq_to_gpio(&msm_gpio.gpio_chip, irq);

	int gpio = msm_irq_to_gpio(&msm_gpio.gpio_chip, d->irq);



	writel(BIT(INTR_STATUS), GPIO_INTR_STATUS(gpio));

	if (test_bit(gpio, msm_gpio.dual_edge_irqs))

		msm_gpio_update_dual_edge_pos(gpio);

}



static void msm_gpio_irq_mask(unsigned int irq)

static void msm_gpio_irq_mask(struct irq_data *d)

{

	int gpio = msm_irq_to_gpio(&msm_gpio.gpio_chip, irq);

	int gpio = msm_irq_to_gpio(&msm_gpio.gpio_chip, d->irq);

	unsigned long irq_flags;



	spin_lock_irqsave(&tlmm_lock, irq_flags);
@@ -251,9 +251,9 @@ static void msm_gpio_irq_mask(unsigned int irq) 
	spin_unlock_irqrestore(&tlmm_lock, irq_flags);

}



static void msm_gpio_irq_unmask(unsigned int irq)

static void msm_gpio_irq_unmask(struct irq_data *d)

{

	int gpio = msm_irq_to_gpio(&msm_gpio.gpio_chip, irq);

	int gpio = msm_irq_to_gpio(&msm_gpio.gpio_chip, d->irq);

	unsigned long irq_flags;



	spin_lock_irqsave(&tlmm_lock, irq_flags);
@@ -263,9 +263,9 @@ static void msm_gpio_irq_unmask(unsigned int irq) 
	spin_unlock_irqrestore(&tlmm_lock, irq_flags);

}



static int msm_gpio_irq_set_type(unsigned int irq, unsigned int flow_type)

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

{

	int gpio = msm_irq_to_gpio(&msm_gpio.gpio_chip, irq);

	int gpio = msm_irq_to_gpio(&msm_gpio.gpio_chip, d->irq);

	unsigned long irq_flags;

	uint32_t bits;
@@ -309,6 +309,7 @@ static int msm_gpio_irq_set_type(unsigned int irq, unsigned int flow_type) 
 */

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

{

	struct irq_data *data = irq_desc_get_irq_data(desc);

	unsigned long i;



	for (i = find_first_bit(msm_gpio.enabled_irqs, NR_GPIO_IRQS);
@@ -318,12 +319,12 @@ static void msm_summary_irq_handler(unsigned int irq, struct irq_desc *desc) 
			generic_handle_irq(msm_gpio_to_irq(&msm_gpio.gpio_chip,

							   i));

	}

	desc->chip->ack(irq);

	data->chip->irq_ack(data);

}



static int msm_gpio_irq_set_wake(unsigned int irq, unsigned int on)

static int msm_gpio_irq_set_wake(struct irq_data *d, unsigned int on)

{

	int gpio = msm_irq_to_gpio(&msm_gpio.gpio_chip, irq);

	int gpio = msm_irq_to_gpio(&msm_gpio.gpio_chip, d->irq);



	if (on) {

		if (bitmap_empty(msm_gpio.wake_irqs, NR_GPIO_IRQS))
@@ -340,11 +341,11 @@ static int msm_gpio_irq_set_wake(unsigned int irq, unsigned int on) 


static struct irq_chip msm_gpio_irq_chip = {

	.name		= "msmgpio",

	.mask		= msm_gpio_irq_mask,

	.unmask		= msm_gpio_irq_unmask,

	.ack		= msm_gpio_irq_ack,

	.set_type	= msm_gpio_irq_set_type,

	.set_wake	= msm_gpio_irq_set_wake,

	.irq_mask	= msm_gpio_irq_mask,

	.irq_unmask	= msm_gpio_irq_unmask,

	.irq_ack	= msm_gpio_irq_ack,

	.irq_set_type	= msm_gpio_irq_set_type,

	.irq_set_wake	= msm_gpio_irq_set_wake,

};



static int __devinit msm_gpio_probe(struct platform_device *dev)