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

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>

diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index 7d22aead22578edb79a9d04ee87a4722fe549fcd..8f8e0b8df8107404ee6c06b36bfceacb3e9e58bc 100644 (file)
--- a/drivers/staging/comedi/drivers/me4000.c
+++ b/drivers/staging/comedi/drivers/me4000.c
@@ -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;
@@ -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;
 }
 
 /*=============================================================================
@@ -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)
@@ -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);
                }
        }