|
@@ -277,8 +277,7 @@ static int jz4740_adc_probe(struct platform_device *pdev)
|
|
|
|
|
|
adc->gc = gc;
|
|
|
|
|
|
- irq_set_handler_data(adc->irq, gc);
|
|
|
- irq_set_chained_handler(adc->irq, jz4740_adc_irq_demux);
|
|
|
+ irq_set_chained_handler_and_data(adc->irq, jz4740_adc_irq_demux, gc);
|
|
|
|
|
|
writeb(0x00, adc->base + JZ_REG_ADC_ENABLE);
|
|
|
writeb(0xff, adc->base + JZ_REG_ADC_CTRL);
|
|
@@ -308,8 +307,7 @@ static int jz4740_adc_remove(struct platform_device *pdev)
|
|
|
|
|
|
irq_remove_generic_chip(adc->gc, IRQ_MSK(5), IRQ_NOPROBE | IRQ_LEVEL, 0);
|
|
|
kfree(adc->gc);
|
|
|
- irq_set_handler_data(adc->irq, NULL);
|
|
|
- irq_set_chained_handler(adc->irq, NULL);
|
|
|
+ irq_set_chained_handler_and_data(adc->irq, NULL, NULL);
|
|
|
|
|
|
iounmap(adc->base);
|
|
|
release_mem_region(adc->mem->start, resource_size(adc->mem));
|