staging: comedi: comedi_bond: just check devprivs->devs once on detach
authorIan Abbott <abbotti@mev.co.uk>
Fri, 23 Aug 2013 13:45:06 +0000 (14:45 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 26 Aug 2013 13:41:56 +0000 (06:41 -0700)
The `while` loop in `bonding_detach()` doesn't need to check
`devpriv->devs` each time round the loop.  Move the test outside the
loop.  The enclosing `if (devpriv)` can be changed to `if (devpriv &&
devpriv->devs)` as everything in this `if` statement is associated with
`devpriv->devs` anyway.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/comedi_bond.c

index a2cc28565586e50d7f351a1ac3c020d351b3d202..2ea605fa683f4437e173f45fb9cbff1a884b4267 100644 (file)
@@ -339,11 +339,11 @@ static void bonding_detach(struct comedi_device *dev)
 {
        struct comedi_bond_private *devpriv = dev->private;
 
-       if (devpriv) {
+       if (devpriv && devpriv->devs) {
                DECLARE_BITMAP(devs_closed, COMEDI_NUM_BOARD_MINORS);
 
                memset(&devs_closed, 0, sizeof(devs_closed));
-               while (devpriv->ndevs-- && devpriv->devs) {
+               while (devpriv->ndevs--) {
                        struct bonded_device *bdev;
 
                        bdev = devpriv->devs[devpriv->ndevs];