Commit 00f5c774 authored Oct 24, 2012 by H Hartley Sweeten Committed by Greg Kroah-Hartman Oct 24, 2012

staging: comedi: dyna_pci10xx: remove PCI_VENDOR_ID_DYNALOG



The PCI chip used on this board is from PLX Technologies Inc. As stated
in the comments of this driver, Dynalog does not have a registered PCI
vendor id so this board uses the PLX vendor id. The kernel provides an
id for that vendor in pci_ids.h (PCI_VENDOR_ID_PLX). Use it instead of
creating a duplicate with a different name.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 26853312

drivers/staging/comedi/drivers/dyna_pci10xx.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -40,8 +40,6 @@
		#include "../comedidev.h"
		#include <linux/mutex.h>

		#define PCI_VENDOR_ID_DYNALOG 0x10b5

		#define READ_TIMEOUT 50

		static const struct comedi_lrange range_pci1050_ai = { 3, {
		@@ -283,7 +281,7 @@ static void __devexit dyna_pci10xx_pci_remove(struct pci_dev *dev)
		}

		static DEFINE_PCI_DEVICE_TABLE(dyna_pci10xx_pci_table) = {
		{ PCI_DEVICE(PCI_VENDOR_ID_DYNALOG, 0x1050) },
		{ PCI_DEVICE(PCI_VENDOR_ID_PLX, 0x1050) },
		{ 0 }
		};
		MODULE_DEVICE_TABLE(pci, dyna_pci10xx_pci_table);

Admin message