summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorEric Sesterhenn <snakebyte@gmx.de>2006-03-26 18:23:47 +0200
committerAdrian Bunk <bunk@stusta.de>2006-03-26 18:23:47 +0200
commitfddaaae16ba4d9f4d392a9ef94616d9d22485571 (patch)
treee2fdac204165026ead5fb5722f2ca1b3b9dfb89f /drivers/input
parent547bc92649345af6014578a64b27cc5787617935 (diff)
downloadlinux-3.10-fddaaae16ba4d9f4d392a9ef94616d9d22485571.tar.gz
linux-3.10-fddaaae16ba4d9f4d392a9ef94616d9d22485571.tar.bz2
linux-3.10-fddaaae16ba4d9f4d392a9ef94616d9d22485571.zip
BUG_ON() Conversion in input/serio/hp_sdc_mlc.c
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>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/serio/hp_sdc_mlc.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/input/serio/hp_sdc_mlc.c b/drivers/input/serio/hp_sdc_mlc.c
index 1c9426fd520..aa4a8a4ccfd 100644
--- a/drivers/input/serio/hp_sdc_mlc.c
+++ b/drivers/input/serio/hp_sdc_mlc.c
@@ -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 */