diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-07-18 19:02:29 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-19 16:51:38 -0700 |
| commit | f32e6061d5756b795eca58549093d5de7cd6d952 (patch) | |
| tree | cf6fd4ed13dcd05941a1ca825e709c625d7562c6 /drivers/staging/comedi | |
| parent | a890062bb785fcf8b160cb8b635aefffebfd0e8d (diff) | |
| download | linux-f32e6061d5756b795eca58549093d5de7cd6d952.tar.bz2 | |
staging: comedi: ke_counter: minor cleanup of cnt_attach()
Cleanup the attach function a bit to follow the style of
the other comedi pci drivers.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi')
| -rw-r--r-- | drivers/staging/comedi/drivers/ke_counter.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/comedi/drivers/ke_counter.c b/drivers/staging/comedi/drivers/ke_counter.c index 826e6c205421..78eb8d44c227 100644 --- a/drivers/staging/comedi/drivers/ke_counter.c +++ b/drivers/staging/comedi/drivers/ke_counter.c @@ -158,9 +158,9 @@ static struct pci_dev *cnt_find_pci_dev(struct comedi_device *dev, static int cnt_attach(struct comedi_device *dev, struct comedi_devconfig *it) { - struct pci_dev *pci_device; + const struct cnt_board_struct *board; + struct pci_dev *pcidev; struct comedi_subdevice *subdevice; - struct cnt_board_struct *board; unsigned long io_base; int error; @@ -169,16 +169,16 @@ static int cnt_attach(struct comedi_device *dev, struct comedi_devconfig *it) if (error < 0) return error; - pci_device = cnt_find_pci_dev(dev, it); - if (!pci_device) + pcidev = cnt_find_pci_dev(dev, it); + if (!pcidev) return -EIO; - devpriv->pcidev = pci_device; - board = (struct cnt_board_struct *)dev->board_ptr; + devpriv->pcidev = pcidev; + board = comedi_board(dev); dev->board_name = board->name; /* enable PCI device and request regions */ - error = comedi_pci_enable(pci_device, CNT_DRIVER_NAME); + error = comedi_pci_enable(pcidev, CNT_DRIVER_NAME); if (error < 0) { printk(KERN_WARNING "comedi%d: " "failed to enable PCI device and request regions!\n", @@ -187,7 +187,7 @@ static int cnt_attach(struct comedi_device *dev, struct comedi_devconfig *it) } /* read register base address [PCI_BASE_ADDRESS #0] */ - io_base = pci_resource_start(pci_device, 0); + io_base = pci_resource_start(pcidev, 0); dev->iobase = io_base; error = comedi_alloc_subdevices(dev, 1); |