From fa841b2b0b3401b8f2ee1dd9a7e2b7f13c63fd7e Mon Sep 17 00:00:00 2001 From: Robert Marklund Date: Thu, 23 Jun 2011 13:30:59 +0200 Subject: mfd: prcmu-updates: Fix for merge from 35 merge with original commits Signed-off-by: Robert Marklund --- drivers/mfd/ab5500-core.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'drivers/mfd/ab5500-core.c') diff --git a/drivers/mfd/ab5500-core.c b/drivers/mfd/ab5500-core.c index b50da3c5a76..75c773b232f 100755 --- a/drivers/mfd/ab5500-core.c +++ b/drivers/mfd/ab5500-core.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #define AB5500_NAME_STRING "ab5500" #define AB5500_ID_FORMAT_STRING "AB5500 %s" @@ -1332,7 +1332,7 @@ static int ab5500_startup_irq_enabled(struct device *dev, unsigned int irq) struct ab5500 *ab; bool val; - ab = get_irq_chip_data(irq); + ab = irq_get_chip_data(irq); irq -= ab->irq_base; val = ((ab->startup_events[irq / 8] & BIT(irq % 8)) != 0); @@ -2303,10 +2303,10 @@ static int ab5500_irq_init(struct ab5500 *ab) for (i = 0; i < ab5500_plf_data->irq.count; i++) { irq = ab5500_plf_data->irq.base + i; - set_irq_chip_data(irq, ab); - set_irq_chip_and_handler(irq, &ab5500_irq_chip, + irq_set_chip_data(irq, ab); + irq_set_chip_and_handler(irq, &ab5500_irq_chip, handle_simple_irq); - set_irq_nested_thread(irq, 1); + irq_set_nested_thread(irq, 1); #ifdef CONFIG_ARM set_irq_flags(irq, IRQF_VALID); #else @@ -2328,8 +2328,8 @@ static void ab5500_irq_remove(struct ab5500 *ab) #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); } } @@ -2428,7 +2428,7 @@ static int __init ab5500_probe(struct platform_device *pdev) /* Set up and register the platform devices. */ for (i = 0; i < AB5500_NUM_DEVICES; i++) { - ab5500_devs[i].mfd_data = ab5500_plf_data->dev_data[i]; + ab5500_devs[i].platform_data = ab5500_plf_data->dev_data[i]; } err = mfd_add_devices(&pdev->dev, 0, ab5500_devs, -- cgit v1.2.3