diff options
| author | Virupax Sadashivpetimath <virupax.sadashivpetimath@stericsson.com> | 2011-08-17 21:04:48 +0530 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 16:00:14 +0200 |
| commit | abc1612e6aab4df00a07792f16494bf941a364e7 (patch) | |
| tree | f79a889fb96cb1178c0fb533f2996419833b8f7d /drivers/mfd | |
| parent | 980df69386d577ba46a31fd5e8990062398cf5be (diff) | |
mfd: Convert tc35892 to new irq_ methods
Change-Id: I841eff44f2939b5e718050039a0a2ccb87477461
Signed-off-by: Virupax Sadashivpetimath <virupax.sadashivpetimath@stericsson.com>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/tc35892.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/mfd/tc35892.c b/drivers/mfd/tc35892.c index e619e2a5599..3f3a5d8d435 100644 --- a/drivers/mfd/tc35892.c +++ b/drivers/mfd/tc35892.c @@ -170,8 +170,8 @@ static void tc35892_irq_dummy(unsigned int irq) static struct irq_chip tc35892_irq_chip = { .name = "tc35892", - .mask = tc35892_irq_dummy, - .unmask = tc35892_irq_dummy, + .irq_mask = tc35892_irq_dummy, + .irq_unmask = tc35892_irq_dummy, }; static int tc35892_irq_init(struct tc35892 *tc35892) @@ -180,10 +180,10 @@ static int tc35892_irq_init(struct tc35892 *tc35892) int irq; for (irq = base; irq < base + TC35892_NR_INTERNAL_IRQS; irq++) { - set_irq_chip_data(irq, tc35892); - set_irq_chip_and_handler(irq, &tc35892_irq_chip, + irq_set_chip_data(irq, tc35892); + irq_set_chip_and_handler(irq, &tc35892_irq_chip, handle_edge_irq); - set_irq_nested_thread(irq, 1); + irq_set_nested_thread(irq, 1); #ifdef CONFIG_ARM set_irq_flags(irq, IRQF_VALID); #else @@ -203,8 +203,8 @@ static void tc35892_irq_remove(struct tc35892 *tc35892) #ifdef CONFIG_ARM set_irq_flags(irq, 0); #endif - set_irq_chip_and_handler(irq, NULL, NULL); - set_irq_chip_data(irq, NULL); + irq_set_chip_and_handler(irq, NULL, NULL); + irq_set_chip_data(irq, NULL); } } |