lkml.org 
[lkml]   [2012]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 26/35] staging: comedi: cb_pcimdda: remove regs_badrindex and reg_sz from boardinfo
    Date
    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@visionengravers.com>
    Cc: Ian Abbott <abbotti@mev.co.uk>
    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    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


    \
     
     \ /
      Last update: 2012-08-17 05:41    [W:0.025 / U:60.412 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site