evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
`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>
This commit is contained in:
Ian Abbott 2014-07-25 18:07:09 +01:00 • committed by Greg Kroah-Hartman
parent ffe29dc666
commit 5d3d4b26f5
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/staging/comedi/drivers/amplc_dio200_pci.c
View file

@ -414,13 +414,10 @@ static int dio200_pci_auto_attach(struct comedi_device *dev,
static void dio200_pci_detach(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; struct dio200_private *devpriv = dev->private;
if (!thisboard || !devpriv)
return;
amplc_dio200_common_detach(dev); amplc_dio200_common_detach(dev);
if (devpriv->io.regtype == mmio_regtype) if (devpriv && devpriv->io.regtype == mmio_regtype)
iounmap(devpriv->io.u.membase); iounmap(devpriv->io.u.membase);
comedi_pci_disable(dev); comedi_pci_disable(dev);
} }