From: Ian Abbott Date: Fri, 23 Aug 2013 13:45:06 +0000 (+0100) Subject: staging: comedi: comedi_bond: just check devprivs->devs once on detach X-Git-Tag: upstream/snapshot3+hdmi~4473^2~73 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7b8cbe92be6dc2665e3247f4b136199055972b5a;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git staging: comedi: comedi_bond: just check devprivs->devs once on detach 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/comedi_bond.c b/drivers/staging/comedi/drivers/comedi_bond.c index a2cc285..2ea605f 100644 --- a/drivers/staging/comedi/drivers/comedi_bond.c +++ b/drivers/staging/comedi/drivers/comedi_bond.c @@ -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];