lkml.org 
[lkml]   [2012]   [Jul]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 58/90] staging: comedi: contec_pci_dio: store the pci_dev in the comedi_device
    Date
    Use the hw_dev pointer in the comedi_device struct to hold the
    pci_dev instead of carrying it in the private data.

    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/contec_pci_dio.c | 13 ++++++-------
    1 file changed, 6 insertions(+), 7 deletions(-)

    diff --git a/drivers/staging/comedi/drivers/contec_pci_dio.c b/drivers/staging/comedi/drivers/contec_pci_dio.c
    index b75a8af..5578c2c 100644
    --- a/drivers/staging/comedi/drivers/contec_pci_dio.c
    +++ b/drivers/staging/comedi/drivers/contec_pci_dio.c
    @@ -59,9 +59,6 @@ static const struct contec_board contec_boards[] = {

    struct contec_private {
    int data;
    -
    - struct pci_dev *pci_dev;
    -
    };

    #define devpriv ((struct contec_private *)dev->private)
    @@ -143,7 +140,7 @@ static int contec_attach(struct comedi_device *dev, struct comedi_devconfig *it)
    pcidev = contec_find_pci_dev(dev, it);
    if (!pcidev)
    return -EIO;
    - devpriv->pci_dev = pcidev;
    + comedi_set_hw_dev(dev, &pcidev->dev);

    if (comedi_pci_enable(pcidev, "contec_pci_dio")) {
    printk("error enabling PCI device and request regions!\n");
    @@ -176,10 +173,12 @@ static int contec_attach(struct comedi_device *dev, struct comedi_devconfig *it)

    static void contec_detach(struct comedi_device *dev)
    {
    - if (devpriv && devpriv->pci_dev) {
    + struct pci_dev *pcidev = comedi_to_pci_dev(dev);
    +
    + if (pcidev) {
    if (dev->iobase)
    - comedi_pci_disable(devpriv->pci_dev);
    - pci_dev_put(devpriv->pci_dev);
    + comedi_pci_disable(pcidev);
    + pci_dev_put(pcidev);
    }
    }

    --
    1.7.11


    \
     
     \ /
      Last update: 2012-07-19 04:41    [W:0.025 / U:30.116 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site