From patchwork Fri Dec 31 11:37:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Igor M. Liplianin" X-Patchwork-Id: 442901 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p019WcH6010888 for ; Sat, 1 Jan 2011 09:32:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752186Ab1AAJcZ (ORCPT ); Sat, 1 Jan 2011 04:32:25 -0500 Received: from mail-ew0-f46.google.com ([209.85.215.46]:48009 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751964Ab1AAJcY (ORCPT ); Sat, 1 Jan 2011 04:32:24 -0500 Received: by ewy5 with SMTP id 5so5608391ewy.19 for ; Sat, 01 Jan 2011 01:32:23 -0800 (PST) Received: by 10.213.28.66 with SMTP id l2mr15389417ebc.71.1293874343393; Sat, 01 Jan 2011 01:32:23 -0800 (PST) Received: from useri.localnet ([93.125.74.3]) by mx.google.com with ESMTPS id t50sm12964769eeh.6.2011.01.01.01.32.21 (version=SSLv3 cipher=RC4-MD5); Sat, 01 Jan 2011 01:32:22 -0800 (PST) Message-ID: <4d1ef4a6.ca7a0e0a.3fb5.0561@mx.google.com> From: "Igor M. Liplianin" Date: Fri, 31 Dec 2010 13:37:00 +0200 Subject: [PATCH 10/18] cx23885: remove duplicate set interrupt mask To: , , Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Sat, 01 Jan 2011 09:32:43 +0000 (UTC) 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; }