Skip to content

Commit

Permalink
staging: comedi: me4000: add namespace to reset_board()
Browse files Browse the repository at this point in the history
Rename reset_board() to me4000_reset() so it has namespace associated
with this driver. Change it's return type to void, it always succeeds.

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 Sep 8, 2012
1 parent b179748 commit 2f348ec
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions drivers/staging/comedi/drivers/me4000.c
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ static int xilinx_download(struct comedi_device *dev)
return 0;
}

static int reset_board(struct comedi_device *dev)
static void me4000_reset(struct comedi_device *dev)
{
struct me4000_info *info = dev->private;
unsigned long val;
Expand Down Expand Up @@ -347,8 +347,6 @@ static int reset_board(struct comedi_device *dev)
*/
if (!(inl(dev->iobase + ME4000_DIO_DIR_REG) & 0x1))
outl(0x1, dev->iobase + ME4000_DIO_CTRL_REG);

return 0;
}

/*=============================================================================
Expand Down Expand Up @@ -1785,9 +1783,7 @@ static int me4000_attach_pci(struct comedi_device *dev,
if (result)
return result;

result = reset_board(dev);
if (result)
return result;
me4000_reset(dev);

result = comedi_alloc_subdevices(dev, 4);
if (result)
Expand Down Expand Up @@ -1905,7 +1901,7 @@ static void me4000_detach(struct comedi_device *dev)
free_irq(dev->irq, dev);
if (pcidev) {
if (dev->iobase) {
reset_board(dev);
me4000_reset(dev);
comedi_pci_disable(pcidev);
}
}
Expand Down

0 comments on commit 2f348ec

Please sign in to comment.