[PATCH 26/35] staging: comedi: cb_pcimdda: remove regs_badrindex and reg_sz from boardinfo

From: H Hartley Sweeten
Date: Thu Aug 16 2012 - 22:52:06 EST


The base address of the card is always found in pci resource 3. There is
no need to carry this information in the boardinfo. The reg_sz is not
used in the driver. Remove them.

Signed-off-by: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx>
Cc: Ian Abbott <abbotti@xxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/staging/comedi/drivers/cb_pcimdda.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/staging/comedi/drivers/cb_pcimdda.c b/drivers/staging/comedi/drivers/cb_pcimdda.c
index ecad85b..0e34603 100644
--- a/drivers/staging/comedi/drivers/cb_pcimdda.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdda.c
@@ -107,9 +107,6 @@ struct cb_pcimdda_board {
unsigned short device_id;
int ao_chans;
int ao_bits;
- int regs_badrindex; /* IO Region for the control, analog output,
- and DIO registers */
- int reg_sz; /* number of bytes of registers in io region */
};

static const struct cb_pcimdda_board cb_pcimdda_boards[] = {
@@ -118,8 +115,6 @@ static const struct cb_pcimdda_board cb_pcimdda_boards[] = {
.device_id = PCI_ID_PCIM_DDA06_16,
.ao_chans = 6,
.ao_bits = 16,
- .regs_badrindex = 3,
- .reg_sz = 16,
}
};

@@ -252,7 +247,7 @@ static int cb_pcimdda_attach(struct comedi_device *dev,
ret = comedi_pci_enable(pcidev, dev->board_name);
if (ret)
return ret;
- dev->iobase = pci_resource_start(pcidev, thisboard->regs_badrindex);
+ dev->iobase = pci_resource_start(pcidev, 3);

ret = comedi_alloc_subdevices(dev, 2);
if (ret)
--
1.7.11

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/