diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-04-10 11:26:54 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-11 12:54:34 -0700 |
| commit | 5aa41d4ce4e1fd71e256f938448424b4f28871c4 (patch) | |
| tree | 61f0d6da31af9fd6139bc9cd288f3603aaf3a859 | |
| parent | 10e6b5554ac9cc0f3b3951b2aec45451e465f8c3 (diff) | |
staging: comedi: gsc_hpdi: remove the base_address_regions enum
This enum is only used in the ioremap of the PCI resources and it
doesn't really help make the code any clearer.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/drivers/gsc_hpdi.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/staging/comedi/drivers/gsc_hpdi.c b/drivers/staging/comedi/drivers/gsc_hpdi.c index ba44d0375c20..4221f2625059 100644 --- a/drivers/staging/comedi/drivers/gsc_hpdi.c +++ b/drivers/staging/comedi/drivers/gsc_hpdi.c @@ -78,12 +78,6 @@ static int dio_config_block_size(struct comedi_device *dev, unsigned int *data); #define NUM_DMA_BUFFERS 4 #define NUM_DMA_DESCRIPTORS 256 -/* indices of base address regions */ -enum base_address_regions { - PLX9080_BADDRINDEX = 0, - HPDI_BADDRINDEX = 2, -}; - enum hpdi_registers { FIRMWARE_REV_REG = 0x0, BOARD_CONTROL_REG = 0x4, @@ -505,11 +499,11 @@ static int hpdi_auto_attach(struct comedi_device *dev, pci_set_master(pcidev); devpriv->plx9080_iobase = - ioremap(pci_resource_start(pcidev, PLX9080_BADDRINDEX), - pci_resource_len(pcidev, PLX9080_BADDRINDEX)); + ioremap(pci_resource_start(pcidev, 0), + pci_resource_len(pcidev, 0)); devpriv->hpdi_iobase = - ioremap(pci_resource_start(pcidev, HPDI_BADDRINDEX), - pci_resource_len(pcidev, HPDI_BADDRINDEX)); + ioremap(pci_resource_start(pcidev, 2), + pci_resource_len(pcidev, 2)); if (!devpriv->plx9080_iobase || !devpriv->hpdi_iobase) { dev_warn(dev->class_dev, "failed to remap io memory\n"); return -ENOMEM; |
