Skip to content

Commit

Permalink
staging: comedi: ke_counter: minor cleanup of cnt_attach()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jul 19, 2012
1 parent a890062 commit f32e606
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions drivers/staging/comedi/drivers/ke_counter.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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",
Expand All @@ -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);
Expand Down

0 comments on commit f32e606

Please sign in to comment.