staging: comedi: amplc_dio200_pci: no need to test board pointer in dio200_pci_detach()

`dio200_pci_detach()` doesn't need to check if the pointer to constant
board data (`thisboard`) and the pointer to private per-device data
(`devpriv`) are valid before calling `amplc_dio200_common_detach()`.  It
has no further need to check `thisboard` so remove the variable
altogether.  Move the test of `devpriv` to the first point it is needs
to be valid.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/amplc_dio200_pci.c b/drivers/staging/comedi/drivers/amplc_dio200_pci.c
index 3cec0e020adb46f5c94b2015896e22320c13177e..1954c1bd23dbae12e551a77d37e53a443823dde0 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_dio200_pci.c
+++ b/drivers/staging/comedi/drivers/amplc_dio200_pci.c
@@ -414,13 +414,10 @@ static int dio200_pci_auto_attach(struct comedi_device *dev,
 
 static void dio200_pci_detach(struct comedi_device *dev)
 {
-       const struct dio200_board *thisboard = comedi_board(dev);
        struct dio200_private *devpriv = dev->private;
 
-       if (!thisboard || !devpriv)
-               return;
        amplc_dio200_common_detach(dev);
-       if (devpriv->io.regtype == mmio_regtype)
+       if (devpriv && devpriv->io.regtype == mmio_regtype)
                iounmap(devpriv->io.u.membase);
        comedi_pci_disable(dev);
 }