← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/mfd/jz4740-adc.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/mfd/jz4740-adc.c
112
112
 
113
113
static void jz4740_adc_irq_demux(unsigned int irq, struct irq_desc *desc)
114
114
{
115
 
        struct jz4740_adc *adc = get_irq_desc_data(desc);
 
115
        struct jz4740_adc *adc = irq_desc_get_handler_data(desc);
116
116
        uint8_t status;
117
117
        unsigned int i;
118
118
 
310
310
        platform_set_drvdata(pdev, adc);
311
311
 
312
312
        for (irq = adc->irq_base; irq < adc->irq_base + 5; ++irq) {
313
 
                set_irq_chip_data(irq, adc);
314
 
                set_irq_chip_and_handler(irq, &jz4740_adc_irq_chip,
315
 
                    handle_level_irq);
 
313
                irq_set_chip_data(irq, adc);
 
314
                irq_set_chip_and_handler(irq, &jz4740_adc_irq_chip,
 
315
                                         handle_level_irq);
316
316
        }
317
317
 
318
 
        set_irq_data(adc->irq, adc);
319
 
        set_irq_chained_handler(adc->irq, jz4740_adc_irq_demux);
 
318
        irq_set_handler_data(adc->irq, adc);
 
319
        irq_set_chained_handler(adc->irq, jz4740_adc_irq_demux);
320
320
 
321
321
        writeb(0x00, adc->base + JZ_REG_ADC_ENABLE);
322
322
        writeb(0xff, adc->base + JZ_REG_ADC_CTRL);
347
347
 
348
348
        mfd_remove_devices(&pdev->dev);
349
349
 
350
 
        set_irq_data(adc->irq, NULL);
351
 
        set_irq_chained_handler(adc->irq, NULL);
 
350
        irq_set_handler_data(adc->irq, NULL);
 
351
        irq_set_chained_handler(adc->irq, NULL);
352
352
 
353
353
        iounmap(adc->base);
354
354
        release_mem_region(adc->mem->start, resource_size(adc->mem));