From: "Igor M. Liplianin" <liplianin@me.by>
To: <mchehab@infradead.org>,
linux-media@vger.kernel.org, <linux-kernel@vger.kernel.org>,
<aospan@netup.ru>
Subject: [PATCH 10/18] cx23885: remove duplicate set interrupt mask
Date: Sat, 28 Aug 2010 02:47:15 +0300 [thread overview]
Message-ID: <4d1d6ad9.857a0e0a.45e5.ffffd91c@mx.google.com> (raw)
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
next reply other threads:[~2010-12-31 5:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-27 23:47 Igor M. Liplianin [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-12-31 11:37 [PATCH 10/18] cx23885: remove duplicate set interrupt mask Igor M. Liplianin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4d1d6ad9.857a0e0a.45e5.ffffd91c@mx.google.com \
--to=liplianin@me.by \
--cc=aospan@netup.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox