* [PATCH 10/18] cx23885: remove duplicate set interrupt mask
@ 2010-08-27 23:47 Igor M. Liplianin
0 siblings, 0 replies; 2+ messages in thread
From: Igor M. Liplianin @ 2010-08-27 23:47 UTC (permalink / raw)
To: mchehab, linux-media, linux-kernel, aospan
Signed-off-by: Igor M. Liplianin <liplianin@netup.ru>
---
drivers/media/video/cx23885/cx23885-core.c | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
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;
}
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH 10/18] cx23885: remove duplicate set interrupt mask
@ 2010-12-31 11:37 Igor M. Liplianin
0 siblings, 0 replies; 2+ messages in thread
From: Igor M. Liplianin @ 2010-12-31 11:37 UTC (permalink / raw)
To: mchehab, linux-media, linux-kernel
Signed-off-by: Igor M. Liplianin <liplianin@netup.ru>
---
drivers/media/video/cx23885/cx23885-core.c | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
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;
}
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-01-01 9:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-27 23:47 [PATCH 10/18] cx23885: remove duplicate set interrupt mask Igor M. Liplianin
-- strict thread matches above, loose matches on Subject: below --
2010-12-31 11:37 Igor M. Liplianin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).