Removal of 2.0 PCI support

diff --git a/comedi/drivers/amcc_s5933.c b/comedi/drivers/amcc_s5933.c
index 55655444926991adc07ef0932af81d4999bc6eda..4b8abb1b9920298c34a7753d2d1679ce528e6844 100644 (file)
--- a/comedi/drivers/amcc_s5933.c
+++ b/comedi/drivers/amcc_s5933.c
@@ -20,10 +20,6 @@
 
 #include "amcc_s5933.h"
 
-#ifdef PCI_SUPPORT_VER1
-#error    Sorry, no support for 2.1.55 and older! :-((((
-#endif
-
 
 /****************************************************************************/
 

diff --git a/comedi/drivers/amcc_s5933.h b/comedi/drivers/amcc_s5933.h
index b602dfbf84439d26eb5e8053723a9c472652a885..0ff3328b2f56a535ab8aec1f5e63cbb442217420 100644 (file)
--- a/comedi/drivers/amcc_s5933.h
+++ b/comedi/drivers/amcc_s5933.h
@@ -18,9 +18,6 @@
 #include <linux/pci.h>
 #include <linux/comedidev.h>
 
-#ifdef PCI_SUPPORT_VER1
-#error    Sorry, no support for 2.1.55 and older! :-((((
-#endif
 
 
 /****************************************************************************/

diff --git a/comedi/drivers/icp_multi.h b/comedi/drivers/icp_multi.h
index 04fc99eed796a2ecc3333ca98d1f1541c66e377f..b7e80e781c97c0f2540abe453a38c1a89c0939fc 100644 (file)
--- a/comedi/drivers/icp_multi.h
+++ b/comedi/drivers/icp_multi.h
@@ -13,9 +13,6 @@
 #include <linux/pci.h>
 #include <linux/comedidev.h>
 
-#ifdef PCI_SUPPORT_VER1
-#error    Sorry, no support for 2.1.55 and older! :-((((
-#endif
 
 
 /****************************************************************************/

diff --git a/comedi/drivers/ni_labpc.c b/comedi/drivers/ni_labpc.c
index 5ae7432f1866ea42ba31f64f62e8f4139f9f231f..9561d3773bc453a8d4b8001976ced3fd5d632715 100644 (file)
--- a/comedi/drivers/ni_labpc.c
+++ b/comedi/drivers/ni_labpc.c
@@ -764,11 +764,7 @@ static struct mite_struct* labpc_find_device(int bus, int slot)
                // if bus/slot are specified then make sure we have the right bus/slot
                if(bus || slot)
                {
-#ifdef PCI_SUPPORT_VER1
-                       if(bus != mite->pci_bus || slot! = PCI_SLOT(mite->pci_device_fn)) continue;
-#else
                        if(bus != mite->pcidev->bus->number || slot != PCI_SLOT(mite->pcidev->devfn)) continue;
-#endif
                }
                for(i = 0; i < driver_labpc.num_names; i++)
                {

diff --git a/comedi/drivers/ni_pcidio.c b/comedi/drivers/ni_pcidio.c
index f1afde6eeb7764c1467b0a0a1990dfd4b74b5c58..ab0d27492473955a79aaebd282522556a2f30d0f 100644 (file)
--- a/comedi/drivers/ni_pcidio.c
+++ b/comedi/drivers/ni_pcidio.c
@@ -1016,15 +1016,9 @@ static int nidio_find_device(comedi_device *dev,int bus,int slot)
        for(mite=mite_devices;mite;mite=mite->next){
                if(mite->used)continue;
                if(bus || slot){
-#ifdef PCI_SUPPORT_VER1
-                       if(bus!=(mite->pci_bus<<8) ||
-                          slot!=PCI_SLOT(mite->pci_device_fn))
-                               continue;
-#else
                        if(bus!=(mite->pcidev->bus->number<<8) ||
                           slot!=PCI_SLOT(mite->pcidev->devfn))
                                continue;
-#endif
                }
                for(i=0;i<n_nidio_boards;i++){
                        if(mite_device_id(mite)==nidio_boards[i].dev_id){

diff --git a/comedi/drivers/ni_pcimio.c b/comedi/drivers/ni_pcimio.c
index c906eec7e7a4789f0219beecbb99052f736a75ae..f54da6780b23a60c495a78b519505a42117c9dd1 100644 (file)
--- a/comedi/drivers/ni_pcimio.c
+++ b/comedi/drivers/ni_pcimio.c
@@ -645,15 +645,9 @@ static int pcimio_find_device(comedi_device *dev,int bus,int slot)
        for(mite=mite_devices;mite;mite=mite->next){
                if(mite->used)continue;
                if(bus || slot){
-#ifdef PCI_SUPPORT_VER1
-                       if(bus!=mite->pci_bus ||
-                          slot!=PCI_SLOT(mite->pci_device_fn))
-                               continue;
-#else
                        if(bus!=mite->pcidev->bus->number ||
                           slot!=PCI_SLOT(mite->pcidev->devfn))
                                continue;
-#endif
                }
 
                for(i=0;i<n_pcimio_boards;i++){