From patchwork Thu Jun 25 05:13:22 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Perches X-Patchwork-Id: 1671 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Thu, 25 Jun 2009 05:13:53 +0000 Received: from bombadil.infradead.org [18.85.46.34] by caramujo.chehab.org with IMAP (fetchmail-6.3.6) for (single-drop); Thu, 25 Jun 2009 02:32:24 -0300 (BRT) Received: from vger.kernel.org ([209.132.176.167]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1MJhHU-0007wL-Sq; Thu, 25 Jun 2009 05:13:53 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752875AbZFYFNr (ORCPT + 1 other); Thu, 25 Jun 2009 01:13:47 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754629AbZFYFNq (ORCPT ); Thu, 25 Jun 2009 01:13:46 -0400 Received: from 136-022.dsl.LABridge.com ([206.117.136.22]:1441 "EHLO mail.perches.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754101AbZFYFNn (ORCPT ); Thu, 25 Jun 2009 01:13:43 -0400 Received: from localhost.localdomain ([192.168.1.157]) by mail.perches.com (8.9.3/8.9.3) with ESMTP id WAA27478; Wed, 24 Jun 2009 22:13:21 -0700 From: Joe Perches To: linux-kernel@vger.kernel.org Cc: Mauro Carvalho Chehab , Stelian Pop , linux-media@vger.kernel.org Subject: [PATCH 06/19] drivers/media: Use PCI_VDEVICE Date: Wed, 24 Jun 2009 22:13:22 -0700 Message-Id: <1ddf60bd631911577e0b075b6457e39ec87416ae.1245906152.git.joe@perches.com> X-Mailer: git-send-email 1.6.3.1.10.g659a0.dirty In-Reply-To: References: Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Signed-off-by: Joe Perches --- drivers/media/video/bt8xx/bttv-driver.c | 12 ++++-------- drivers/media/video/meye.c | 3 +-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c index 5eb1464..d8d3e1d 100644 --- a/drivers/media/video/bt8xx/bttv-driver.c +++ b/drivers/media/video/bt8xx/bttv-driver.c @@ -4591,14 +4591,10 @@ static int bttv_resume(struct pci_dev *pci_dev) #endif static struct pci_device_id bttv_pci_tbl[] = { - {PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT848, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, - {PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT849, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, - {PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT878, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, - {PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT879, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, + {PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT848), 0}, + {PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT849), 0}, + {PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT878), 0}, + {PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT879), 0}, {0,} }; diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c index 1d66855..d0765be 100644 --- a/drivers/media/video/meye.c +++ b/drivers/media/video/meye.c @@ -1915,8 +1915,7 @@ static void __devexit meye_remove(struct pci_dev *pcidev) } static struct pci_device_id meye_pci_tbl[] = { - { PCI_VENDOR_ID_KAWASAKI, PCI_DEVICE_ID_MCHIP_KL5A72002, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, + { PCI_VDEVICE(KAWASAKI, PCI_DEVICE_ID_MCHIP_KL5A72002), 0 }, { } };