mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-12 21:57:43 +00:00
Code Issues Releases Wiki Activity

staging: comedi: ke_counter: minor cleanup of cnt_attach()

Browse source 
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>
This commit is contained in:
H Hartley Sweeten 2012-07-18 19:02:29 -07:00 committed by Greg Kroah-Hartman
parent a890062bb7
commit f32e6061d5
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/staging/comedi/drivers/ke_counter.c
View file

@ -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);