From d16743fd4572f43bd25aa575a5f015c93921e6ed Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 18 Jul 2012 18:50:42 -0700 Subject: [PATCH] --- yaml --- r: 318101 b: refs/heads/master c: e3ab476bee2c4b038ca9c8e3a2c2fd79f7403749 h: refs/heads/master i: 318099: 496f736333961a530267a603e9a22d3d34c3ab6d v: v3 --- [refs] | 2 +- .../drivers/staging/comedi/drivers/contec_pci_dio.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index cb43e9af63dd..f1330a8ff8a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8acd7750a2366216d9ec81f96b0594f6bb86707 +refs/heads/master: e3ab476bee2c4b038ca9c8e3a2c2fd79f7403749 diff --git a/trunk/drivers/staging/comedi/drivers/contec_pci_dio.c b/trunk/drivers/staging/comedi/drivers/contec_pci_dio.c index b75a8afce5eb..5578c2ca2998 100644 --- a/trunk/drivers/staging/comedi/drivers/contec_pci_dio.c +++ b/trunk/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); } }