Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

V4L/DVB (4919): Budget-ci: Use SAA7146_IER_ENABLE/DISABLE to enable or disable a hardware interrupt

Use SAA7146_IER_ENABLE/DISABLE to enable or disable a hardware interrupt.

Signed-off-by: Hartmut Birr <e9hack@gmail.com>
Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

authored by

Hartmut Birr and committed by
Mauro Carvalho Chehab
97a2cf05 740cf9e1

+4 -4
+4 -4
drivers/media/dvb/ttpci/budget-ci.c
··· 261 261 tasklet_init(&budget_ci->ir.msp430_irq_tasklet, msp430_ir_interrupt, 262 262 (unsigned long) budget_ci); 263 263 264 - saa7146_write(saa, IER, saa7146_read(saa, IER) | MASK_06); 264 + SAA7146_IER_ENABLE(saa, MASK_06); 265 265 saa7146_setgpio(saa, 3, SAA7146_GPIO_IRQHI); 266 266 267 267 return 0; ··· 277 277 struct saa7146_dev *saa = budget_ci->budget.dev; 278 278 struct input_dev *dev = budget_ci->ir.dev; 279 279 280 - saa7146_write(saa, IER, saa7146_read(saa, IER) & ~MASK_06); 280 + SAA7146_IER_DISABLE(saa, MASK_06); 281 281 saa7146_setgpio(saa, 3, SAA7146_GPIO_INPUT); 282 282 tasklet_kill(&budget_ci->ir.msp430_irq_tasklet); 283 283 ··· 537 537 } else { 538 538 saa7146_setgpio(saa, 0, SAA7146_GPIO_IRQHI); 539 539 } 540 - saa7146_write(saa, IER, saa7146_read(saa, IER) | MASK_03); 540 + SAA7146_IER_ENABLE(saa, MASK_03); 541 541 } 542 542 543 543 // enable interface ··· 569 569 570 570 // disable CI interrupts 571 571 if (budget_ci->ci_irq) { 572 - saa7146_write(saa, IER, saa7146_read(saa, IER) & ~MASK_03); 572 + SAA7146_IER_DISABLE(saa, MASK_03); 573 573 saa7146_setgpio(saa, 0, SAA7146_GPIO_INPUT); 574 574 tasklet_kill(&budget_ci->ciintf_irq_tasklet); 575 575 }