From 800c86093ce040b94e019ad55dce6e8cb191714c Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Fri, 7 Sep 2012 17:44:27 -0700 Subject: [PATCH] --- yaml --- r: 324960 b: refs/heads/master c: cfb2cb167ab57a3237a0b8f0a1dc0b92afe62c87 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/me4000.c | 6 ------ trunk/drivers/staging/comedi/drivers/me4000.h | 3 --- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index bf3b3a24d15a..3da367af8372 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 395d6d0f234d164f443f2bfd098091c39d60e6a5 +refs/heads/master: cfb2cb167ab57a3237a0b8f0a1dc0b92afe62c87 diff --git a/trunk/drivers/staging/comedi/drivers/me4000.c b/trunk/drivers/staging/comedi/drivers/me4000.c index 8394718ad848..9cd24d2a3c20 100644 --- a/trunk/drivers/staging/comedi/drivers/me4000.c +++ b/trunk/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/trunk/drivers/staging/comedi/drivers/me4000.h b/trunk/drivers/staging/comedi/drivers/me4000.h index afe91b1d0537..80bc51e73392 100644 --- a/trunk/drivers/staging/comedi/drivers/me4000.h +++ b/trunk/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 */