From cfb2cb167ab57a3237a0b8f0a1dc0b92afe62c87 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Fri, 7 Sep 2012 17:44:27 -0700 Subject: [PATCH] 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 Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/me4000.c | 6 ------ drivers/staging/comedi/drivers/me4000.h | 3 --- 2 files changed, 9 deletions(-) diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c index 8394718ad848..9cd24d2a3c20 100644 --- 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 afe91b1d0537..80bc51e73392 100644 --- 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 */ -- 2.20.1