Skip to content

Commit

Permalink
Staging: comedi: remove LINUX_VERSION_CODE checks
Browse files Browse the repository at this point in the history
Signed-off-by: Mariusz 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: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Mariusz Kozlowski authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 1b9fb14 commit e38eb66
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 22 deletions.
18 changes: 0 additions & 18 deletions drivers/staging/comedi/drivers/addi-data/amcc_s5933_58.h
Original file line number Diff line number Diff line change
Expand Up @@ -251,11 +251,7 @@ void v_pci_card_list_init(unsigned short pci_vendor, char display)
amcc_devices = NULL;
last = NULL;

#if LINUX_VERSION_CODE < 0x020300
for (pcidev = pci_devices; pcidev; pcidev = pcidev->next) {
#else
pci_for_each_dev(pcidev) {
#endif
if (pcidev->vendor == pci_vendor) {
amcc = kmalloc(sizeof(*amcc), GFP_KERNEL);
memset(amcc, 0, sizeof(*amcc));
Expand All @@ -268,18 +264,6 @@ void v_pci_card_list_init(unsigned short pci_vendor, char display)
}
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->device = pcidev->device;
#if 0
Expand All @@ -292,8 +276,6 @@ void v_pci_card_list_init(unsigned short pci_vendor, char display)
amcc->io_addr[i] =
pcidev->resource[i].start & ~3UL;
amcc->irq = pcidev->irq;
#endif

}
}

Expand Down
4 changes: 0 additions & 4 deletions drivers/staging/comedi/kcomedilib/ksyms.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@
#include <linux/mm.h>
#include <linux/slab.h>

#if LINUX_VERSION_CODE >= 0x020200

/* functions specific to kcomedilib */

EXPORT_SYMBOL(comedi_register_callback);
Expand Down Expand Up @@ -140,5 +138,3 @@ EXPORT_SYMBOL(comedi_get_len_chanlist);

/* alpha */
//EXPORT_SYMBOL(comedi_set_global_oor_behavior);

#endif

0 comments on commit e38eb66

Please sign in to comment.