From a9d0ad531b3c985d05dec8a02093de9f1372e5b0 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Fri, 7 Sep 2012 17:44:10 -0700 Subject: [PATCH] --- yaml --- r: 324959 b: refs/heads/master c: 395d6d0f234d164f443f2bfd098091c39d60e6a5 h: refs/heads/master i: 324957: 289b5c3b2a2f2af9b07ecec38b34b1ba4c4a796f 324955: 96124d3cf3aeb2d8e9b5a01311d4fb808ec454fc 324951: ca462036b68f077dbce4edae577d431c308faa6b 324943: 8e37dc49e6791b1796f1659f06a972496a2f0d92 324927: 89adafa4b14aca755a89be9a6bcd035809026ce8 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/me4000.c | 7 ------- trunk/drivers/staging/comedi/drivers/me4000.h | 1 - 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 1532113b6564..bf3b3a24d15a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c1db9a3090c8418088a9e12454144299359884f5 +refs/heads/master: 395d6d0f234d164f443f2bfd098091c39d60e6a5 diff --git a/trunk/drivers/staging/comedi/drivers/me4000.c b/trunk/drivers/staging/comedi/drivers/me4000.c index dfee15de752c..8394718ad848 100644 --- a/trunk/drivers/staging/comedi/drivers/me4000.c +++ b/trunk/drivers/staging/comedi/drivers/me4000.c @@ -332,17 +332,10 @@ static int me4000_probe(struct comedi_device *dev, struct comedi_devconfig *it) static int init_board_info(struct comedi_device *dev, struct pci_dev *pci_dev_p) { - int result; - /* Init spin locks */ /* spin_lock_init(&info->preload_lock); */ /* spin_lock_init(&info->ai_ctrl_lock); */ - /* Get the hardware revision */ - result = pci_read_config_byte(pci_dev_p, 0x08, &info->hw_revision); - if (result != PCIBIOS_SUCCESSFUL) - return result; - /* Get the vendor id */ info->vendor_id = pci_dev_p->vendor; diff --git a/trunk/drivers/staging/comedi/drivers/me4000.h b/trunk/drivers/staging/comedi/drivers/me4000.h index 8aa05f8071e5..afe91b1d0537 100644 --- a/trunk/drivers/staging/comedi/drivers/me4000.h +++ b/trunk/drivers/staging/comedi/drivers/me4000.h @@ -252,7 +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 char hw_revision; /* Hardware revision of the board */ unsigned short vendor_id; /* Meilhaus vendor id */ unsigned short device_id; /* Device id */