leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: me4000: add namespace to reset_board()

Browse Source 
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>
This commit is contained in:
H Hartley Sweeten 2012-09-07 17:49:05 -07:00 committed by Greg Kroah-Hartman
parent b179748d21
commit 2f348ecd2b
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/comedi/drivers/me4000.c
View File

@ -308,7 +308,7 @@ static int xilinx_download(struct comedi_device *dev)
return 0; return 0;
} }
static int reset_board(struct comedi_device *dev) static void me4000_reset(struct comedi_device *dev)
{ {
struct me4000_info *info = dev->private; struct me4000_info *info = dev->private;
unsigned long val; unsigned long val;
@ -347,8 +347,6 @@ static int reset_board(struct comedi_device *dev)
*/ */
if (!(inl(dev->iobase + ME4000_DIO_DIR_REG) & 0x1)) if (!(inl(dev->iobase + ME4000_DIO_DIR_REG) & 0x1))
outl(0x1, dev->iobase + ME4000_DIO_CTRL_REG); outl(0x1, dev->iobase + ME4000_DIO_CTRL_REG);
return 0;
} }
/*============================================================================= /*=============================================================================
@ -1785,9 +1783,7 @@ static int me4000_attach_pci(struct comedi_device *dev,
if (result) if (result)
return result; return result;
result = reset_board(dev); me4000_reset(dev);
if (result)
return result;
result = comedi_alloc_subdevices(dev, 4); result = comedi_alloc_subdevices(dev, 4);
if (result) if (result)
@ -1905,7 +1901,7 @@ static void me4000_detach(struct comedi_device *dev)
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
if (pcidev) { if (pcidev) {
if (dev->iobase) { if (dev->iobase) {
reset_board(dev); me4000_reset(dev);
comedi_pci_disable(pcidev); comedi_pci_disable(pcidev);
} }
} }