[10/18] cx23885: remove duplicate set interrupt mask

Commit Message

Igor M. Liplianin Dec. 31, 2010, 11:37 a.m. UTC

None

Patch

diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index 307eaf4..3a09dd2 100644
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/drivers/media/video/cx23885/cx23885-core.c
@@ -904,12 +904,6 @@  static int cx23885_dev_setup(struct cx23885_dev *dev)
 	dev->pci_bus  = dev->pci->bus->number;
 	dev->pci_slot = PCI_SLOT(dev->pci->devfn);
 	cx23885_irq_add(dev, 0x001f00);
-	if (cx23885_boards[dev->board].ci_type == 1)
-		cx23885_irq_add(dev, 0x01800000); /* for CiMaxes */
-
-	if (cx23885_boards[dev->board].ci_type == 2)
-		cx23885_irq_add(dev, 0x00800000); /* for FPGA */
-
 
 	/* External Master 1 Bus */
 	dev->i2c_bus[0].nr = 0;
@@ -2074,10 +2068,10 @@  static int __devinit cx23885_initdev(struct pci_dev *pci_dev,
 
 	switch (dev->board) {
 	case CX23885_BOARD_NETUP_DUAL_DVBS2_CI:
-		cx23885_irq_add_enable(dev, 0x01800000); /* for NetUP */
+		cx23885_irq_add_enable(dev, PCI_MSK_GPIO1 | PCI_MSK_GPIO0);
 		break;
 	case CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF:
-		cx23885_irq_add_enable(dev, 0x00800000);
+		cx23885_irq_add_enable(dev, PCI_MSK_GPIO0);
 		break;
 	}