]> err.no Git - linux-2.6/commitdiff
BUG_ON() Conversion in input/serio/hp_sdc_mlc.c
authorEric Sesterhenn <snakebyte@gmx.de>
Sun, 26 Mar 2006 16:23:47 +0000 (18:23 +0200)
committerAdrian Bunk <bunk@stusta.de>
Sun, 26 Mar 2006 16:23:47 +0000 (18:23 +0200)
this changes if() BUG(); constructs to BUG_ON() which is
cleaner and can better optimized away

Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
drivers/input/serio/hp_sdc_mlc.c

index 1c9426fd5205665ff0ac45ba9ef35321489d2680..aa4a8a4ccfdbed17d4c9ce5c4c58ba32cb45f3cc 100644 (file)
@@ -270,9 +270,10 @@ static void hp_sdc_mlc_out (hil_mlc *mlc) {
 
  do_control:
        priv->emtestmode = mlc->opacket & HIL_CTRL_TEST;
-       if ((mlc->opacket & (HIL_CTRL_APE | HIL_CTRL_IPF)) == HIL_CTRL_APE) {
-               BUG(); /* we cannot emulate this, it should not be used. */
-       }
+       
+       /* we cannot emulate this, it should not be used. */
+       BUG_ON((mlc->opacket & (HIL_CTRL_APE | HIL_CTRL_IPF)) == HIL_CTRL_APE);
+       
        if ((mlc->opacket & HIL_CTRL_ONLY) == HIL_CTRL_ONLY) goto control_only;
        if (mlc->opacket & HIL_CTRL_APE) { 
                BUG(); /* Should not send command/data after engaging APE */