Merge branch 'fortglx/39/tip/timers/rtc' of git://git.linaro.org/people/jstultz/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / jz4740-adc.c

diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c
index 0cc59795f6004df02380608d28f300f85e07435a..a0bd0cf05af3912b1c0c7d490419a3e6eab9d102 100644 (file)
--- a/drivers/mfd/jz4740-adc.c
+++ b/drivers/mfd/jz4740-adc.c
@@ -112,7 +112,7 @@ static struct irq_chip jz4740_adc_irq_chip = {
 
 static void jz4740_adc_irq_demux(unsigned int irq, struct irq_desc *desc)
 {
-       struct jz4740_adc *adc = get_irq_desc_data(desc);
+       struct jz4740_adc *adc = irq_desc_get_handler_data(desc);
        uint8_t status;
        unsigned int i;
 
@@ -232,8 +232,6 @@ const struct mfd_cell jz4740_adc_cells[] = {
                .name = "jz4740-hwmon",
                .num_resources = ARRAY_SIZE(jz4740_hwmon_resources),
                .resources = jz4740_hwmon_resources,
-               .platform_data = (void *)&jz4740_adc_cells[0],
-               .data_size = sizeof(struct mfd_cell),
 
                .enable = jz4740_adc_cell_enable,
                .disable = jz4740_adc_cell_disable,
@@ -243,8 +241,6 @@ const struct mfd_cell jz4740_adc_cells[] = {
                .name = "jz4740-battery",
                .num_resources = ARRAY_SIZE(jz4740_battery_resources),
                .resources = jz4740_battery_resources,
-               .platform_data = (void *)&jz4740_adc_cells[1],
-               .data_size = sizeof(struct mfd_cell),
 
                .enable = jz4740_adc_cell_enable,
                .disable = jz4740_adc_cell_disable,
@@ -314,13 +310,13 @@ static int __devinit jz4740_adc_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, adc);
 
        for (irq = adc->irq_base; irq < adc->irq_base + 5; ++irq) {
-               set_irq_chip_data(irq, adc);
-               set_irq_chip_and_handler(irq, &jz4740_adc_irq_chip,
-                   handle_level_irq);
+               irq_set_chip_data(irq, adc);
+               irq_set_chip_and_handler(irq, &jz4740_adc_irq_chip,
+                                        handle_level_irq);
        }
 
-       set_irq_data(adc->irq, adc);
-       set_irq_chained_handler(adc->irq, jz4740_adc_irq_demux);
+       irq_set_handler_data(adc->irq, adc);
+       irq_set_chained_handler(adc->irq, jz4740_adc_irq_demux);
 
        writeb(0x00, adc->base + JZ_REG_ADC_ENABLE);
        writeb(0xff, adc->base + JZ_REG_ADC_CTRL);
@@ -351,8 +347,8 @@ static int __devexit jz4740_adc_remove(struct platform_device *pdev)
 
        mfd_remove_devices(&pdev->dev);
 
-       set_irq_data(adc->irq, NULL);
-       set_irq_chained_handler(adc->irq, NULL);
+       irq_set_handler_data(adc->irq, NULL);
+       irq_set_chained_handler(adc->irq, NULL);
 
        iounmap(adc->base);
        release_mem_region(adc->mem->start, resource_size(adc->mem));