diff options
author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-09-18 18:50:05 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-19 09:41:45 +0100 |
commit | bdf7c9dc10912dbad3a5052ee824546535e0b4c1 (patch) | |
tree | 29e47167cfd3e18cab2c8dee6148a75e560c4a13 /drivers/staging/comedi/drivers/daqboard2000.c | |
parent | 8a3f3d37c58ea44a2441fe8be4d8cd0996fc0c3c (diff) |
staging: comedi: daqboard2000: use the pci_resource_len()
Use pci_resource_len() when doing the ioremap instead of assuming
the resource size.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/daqboard2000.c')
-rw-r--r-- | drivers/staging/comedi/drivers/daqboard2000.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c index 88037aea25ac..69bc0e5d8eed 100644 --- a/drivers/staging/comedi/drivers/daqboard2000.c +++ b/drivers/staging/comedi/drivers/daqboard2000.c @@ -122,9 +122,6 @@ Configuration options: not applicable, uses PCI auto config #define DAQBOARD2000_SUBSYSTEM_IDS2 0x0002 /* Daqboard/2000 - 2 Dacs */ #define DAQBOARD2000_SUBSYSTEM_IDS4 0x0004 /* Daqboard/2000 - 4 Dacs */ -#define DAQBOARD2000_DAQ_SIZE 0x1002 -#define DAQBOARD2000_PLX_SIZE 0x100 - /* Initialization bits for the Serial EEPROM Control Register */ #define DAQBOARD2000_SECRProgPinHi 0x8001767e #define DAQBOARD2000_SECRProgPinLo 0x8000767e @@ -721,9 +718,9 @@ static int daqboard2000_attach_pci(struct comedi_device *dev, dev->iobase = 1; /* the "detach" needs this */ pci_base = pci_resource_start(pcidev, 0); - devpriv->plx = ioremap(pci_base, DAQBOARD2000_PLX_SIZE); + devpriv->plx = ioremap(pci_base, pci_resource_len(pcidev, 0)); pci_base = pci_resource_start(pcidev, 2); - devpriv->daq = ioremap(pci_base, DAQBOARD2000_DAQ_SIZE); + devpriv->daq = ioremap(pci_base, pci_resource_len(pcidev, 2)); if (!devpriv->plx || !devpriv->daq) return -ENOMEM; |