Commit e38eb66e authored by Mariusz Kozlowski's avatar Mariusz Kozlowski Committed by Greg Kroah-Hartman

Staging: comedi: remove LINUX_VERSION_CODE checks

Signed-off-by: default avatarMariusz Kozlowski <m.kozlowski@tuxland.pl>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Cc: David Schleef <ds@schleef.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1b9fb14e
...@@ -251,11 +251,7 @@ void v_pci_card_list_init(unsigned short pci_vendor, char display) ...@@ -251,11 +251,7 @@ void v_pci_card_list_init(unsigned short pci_vendor, char display)
amcc_devices = NULL; amcc_devices = NULL;
last = NULL; last = NULL;
#if LINUX_VERSION_CODE < 0x020300
for (pcidev = pci_devices; pcidev; pcidev = pcidev->next) {
#else
pci_for_each_dev(pcidev) { pci_for_each_dev(pcidev) {
#endif
if (pcidev->vendor == pci_vendor) { if (pcidev->vendor == pci_vendor) {
amcc = kmalloc(sizeof(*amcc), GFP_KERNEL); amcc = kmalloc(sizeof(*amcc), GFP_KERNEL);
memset(amcc, 0, sizeof(*amcc)); memset(amcc, 0, sizeof(*amcc));
...@@ -268,18 +264,6 @@ void v_pci_card_list_init(unsigned short pci_vendor, char display) ...@@ -268,18 +264,6 @@ void v_pci_card_list_init(unsigned short pci_vendor, char display)
} }
last = amcc; last = amcc;
#if LINUX_VERSION_CODE < 0x020300
amcc->vendor = pcidev->vendor;
amcc->device = pcidev->device;
amcc->master = pcidev->master;
amcc->pci_bus = pcidev->bus->number;
amcc->pci_slot = PCI_SLOT(pcidev->devfn);
amcc->pci_func = PCI_FUNC(pcidev->devfn);
for (i = 0; i < 5; i++)
amcc->io_addr[i] =
pcidev->base_address[i] & ~3UL;
amcc->irq = pcidev->irq;
#else
amcc->vendor = pcidev->vendor; amcc->vendor = pcidev->vendor;
amcc->device = pcidev->device; amcc->device = pcidev->device;
#if 0 #if 0
...@@ -292,8 +276,6 @@ void v_pci_card_list_init(unsigned short pci_vendor, char display) ...@@ -292,8 +276,6 @@ void v_pci_card_list_init(unsigned short pci_vendor, char display)
amcc->io_addr[i] = amcc->io_addr[i] =
pcidev->resource[i].start & ~3UL; pcidev->resource[i].start & ~3UL;
amcc->irq = pcidev->irq; amcc->irq = pcidev->irq;
#endif
} }
} }
......
...@@ -40,8 +40,6 @@ ...@@ -40,8 +40,6 @@
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/slab.h> #include <linux/slab.h>
#if LINUX_VERSION_CODE >= 0x020200
/* functions specific to kcomedilib */ /* functions specific to kcomedilib */
EXPORT_SYMBOL(comedi_register_callback); EXPORT_SYMBOL(comedi_register_callback);
...@@ -140,5 +138,3 @@ EXPORT_SYMBOL(comedi_get_len_chanlist); ...@@ -140,5 +138,3 @@ EXPORT_SYMBOL(comedi_get_len_chanlist);
/* alpha */ /* alpha */
//EXPORT_SYMBOL(comedi_set_global_oor_behavior); //EXPORT_SYMBOL(comedi_set_global_oor_behavior);
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment