staging: comedi: me4000: remove {vendor, device}_id from the private data

These values are never used. Just remove them.

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>

diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index 8394718ad8486e121089ee4359d07a66638aeae3..9cd24d2a3c209b5e2b88a5a0f74aaa2563f2acb1 100644 (file)
--- a/drivers/staging/comedi/drivers/me4000.c
+++ b/drivers/staging/comedi/drivers/me4000.c
@@ -336,12 +336,6 @@ static int init_board_info(struct comedi_device *dev, struct pci_dev *pci_dev_p)
        /* spin_lock_init(&info->preload_lock); */
        /* spin_lock_init(&info->ai_ctrl_lock); */
 
-       /* Get the vendor id */
-       info->vendor_id = pci_dev_p->vendor;
-
-       /* Get the device id */
-       info->device_id = pci_dev_p->device;
-
        /* Get the irq assigned to the board */
        info->irq = pci_dev_p->irq;
 

diff --git a/drivers/staging/comedi/drivers/me4000.h b/drivers/staging/comedi/drivers/me4000.h
index afe91b1d0537dffbcfe3bb34b5db36fde2bf5425..80bc51e73392f88dd015c0a9050a7912268088fa 100644 (file)
--- a/drivers/staging/comedi/drivers/me4000.h
+++ b/drivers/staging/comedi/drivers/me4000.h
@@ -252,9 +252,6 @@ struct me4000_info {
        unsigned long timer_regbase;    /*  Base address of the timer circuit */
        unsigned long program_regbase;  /*  Base address to set the program pin for the xilinx */
 
-       unsigned short vendor_id;       /*  Meilhaus vendor id */
-       unsigned short device_id;       /*  Device id */
-
        struct pci_dev *pci_dev_p;      /*  General PCI information */
 
        unsigned int irq;       /*  IRQ assigned from the PCI BIOS */