From 36484c64075ca7f7884f8b7dba9e1a7eca76ad83 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 18 Jul 2012 18:24:37 -0700 Subject: [PATCH] --- yaml --- r: 318045 b: refs/heads/master c: f8ec639268156073bf8214a5b9446890764448c8 h: refs/heads/master i: 318043: b31b657829976004b0c1f7c96d0c4036657e4d11 v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/adl_pci6208.c | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index a57164d3b81b..9d7f09593a89 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ddb01367b85df2c4c773bde047e5b04b6de1835b +refs/heads/master: f8ec639268156073bf8214a5b9446890764448c8 diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci6208.c b/trunk/drivers/staging/comedi/drivers/adl_pci6208.c index 487fd4a8124a..3bec0f6e4a8c 100644 --- a/trunk/drivers/staging/comedi/drivers/adl_pci6208.c +++ b/trunk/drivers/staging/comedi/drivers/adl_pci6208.c @@ -73,7 +73,6 @@ static const struct pci6208_board pci6208_boards[] = { }; struct pci6208_private { - struct pci_dev *pci_dev; unsigned int ao_readback[PCI6208_MAX_AO_CHANNELS]; }; @@ -200,6 +199,7 @@ static int pci6208_attach(struct comedi_device *dev, { const struct pci6208_board *thisboard; struct pci6208_private *devpriv; + struct pci_dev *pcidev; struct comedi_subdevice *s; int ret; @@ -208,20 +208,21 @@ static int pci6208_attach(struct comedi_device *dev, return ret; devpriv = dev->private; - devpriv->pci_dev = pci6208_find_device(dev, it); - if (!devpriv->pci_dev) + pcidev = pci6208_find_device(dev, it); + if (!pcidev) return -EIO; + comedi_set_hw_dev(dev, &pcidev->dev); thisboard = comedi_board(dev); dev->board_name = thisboard->name; - ret = comedi_pci_enable(devpriv->pci_dev, dev->driver->driver_name); + ret = comedi_pci_enable(pcidev, dev->driver->driver_name); if (ret) { dev_err(dev->class_dev, "Failed to enable PCI device and request regions\n"); return ret; } - dev->iobase = pci_resource_start(devpriv->pci_dev, 2); + dev->iobase = pci_resource_start(pcidev, 2); ret = comedi_alloc_subdevices(dev, 2); if (ret) @@ -258,12 +259,12 @@ static int pci6208_attach(struct comedi_device *dev, static void pci6208_detach(struct comedi_device *dev) { - struct pci6208_private *devpriv = dev->private; + struct pci_dev *pcidev = comedi_to_pci_dev(dev); - if (devpriv && devpriv->pci_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); } }