[KJ] [Patch 2/2] BUG_ON() Conversion in input/serio/hp_sdc_mlc.c

[KJ] [Patch 2/2] BUG_ON() Conversion in input/serio/hp_sdc_mlc.c

[Eric Sesterhenn / snakebyte]

[-- Attachment #1: Type: text/plain, Size: 928 bytes --]

hi,

this changes if() BUG(); constructs to BUG_ON() which is
cleaner and can better optimized away

Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>

--- linux-2.6.16-rc1-git4/drivers/input/serio/hp_sdc_mlc.c.orig	2006-01-26 16:16:51.000000000 +0100
+++ linux-2.6.16-rc1-git4/drivers/input/serio/hp_sdc_mlc.c	2006-01-26 16:17:42.000000000 +0100
@@ -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 */



[-- Attachment #2: Type: text/plain, Size: 168 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors

Re: [KJ] [Patch 2/2] BUG_ON() Conversion in input/serio/hp_sdc_mlc.c

[Alexey Dobriyan]

[-- Attachment #1: Type: text/plain, Size: 219 bytes --]

On Thu, Jan 26, 2006 at 04:25:30PM +0100, Eric Sesterhenn / snakebyte wrote:
> this changes if() BUG(); constructs to BUG_ON() which is
> cleaner and can better optimized away

Merged. Whitespace damage fixed locally.


[-- Attachment #2: Type: text/plain, Size: 168 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors