aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2008-03-04 18:07:24 -0500
committerTakashi Iwai <tiwai@suse.de>2008-04-24 06:00:22 -0400
commit21ac1f9934d33ea2ffa71d13fa2f6286127d3caf (patch)
tree931b6ad7de0da9e5b745f74c8431d5d2a11b30ae /sound
parent0ccb541c96e6d40844d00ec88fae734568bdd0bd (diff)
sound: Use BUG_ON
if (...) BUG(); should be replaced with BUG_ON(...) when the test has no side-effects to allow a definition of BUG_ON that drops the code completely. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // <smpl> @ disable unlikely @ expression E,f; @@ ( if (<... f(...) ...>) { BUG(); } | - if (unlikely(E)) { BUG(); } + BUG_ON(E); ) @@ expression E,f; @@ ( if (<... f(...) ...>) { BUG(); } | - if (E) { BUG(); } + BUG_ON(E); ) // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/oss/trident.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/sound/oss/trident.c b/sound/oss/trident.c
index d6af9065d1c0..f43f91ef86c7 100644
--- a/sound/oss/trident.c
+++ b/sound/oss/trident.c
@@ -3076,8 +3076,7 @@ ali_ac97_get(struct trident_card *card, int secondary, u8 reg)
3076 u16 wcontrol; 3076 u16 wcontrol;
3077 unsigned long flags; 3077 unsigned long flags;
3078 3078
3079 if (!card) 3079 BUG_ON(!card);
3080 BUG();
3081 3080
3082 address = ALI_AC97_READ; 3081 address = ALI_AC97_READ;
3083 if (card->revision == ALI_5451_V02) { 3082 if (card->revision == ALI_5451_V02) {
@@ -3148,8 +3147,7 @@ ali_ac97_set(struct trident_card *card, int secondary, u8 reg, u16 val)
3148 3147
3149 data = ((u32) val) << 16; 3148 data = ((u32) val) << 16;
3150 3149
3151 if (!card) 3150 BUG_ON(!card);
3152 BUG();
3153 3151
3154 address = ALI_AC97_WRITE; 3152 address = ALI_AC97_WRITE;
3155 mask = ALI_AC97_WRITE_ACTION | ALI_AC97_AUDIO_BUSY; 3153 mask = ALI_AC97_WRITE_ACTION | ALI_AC97_AUDIO_BUSY;
@@ -3213,8 +3211,7 @@ ali_ac97_read(struct ac97_codec *codec, u8 reg)
3213 struct trident_card *card = NULL; 3211 struct trident_card *card = NULL;
3214 3212
3215 /* Added by Matt Wu */ 3213 /* Added by Matt Wu */
3216 if (!codec) 3214 BUG_ON(!codec);
3217 BUG();
3218 3215
3219 card = (struct trident_card *) codec->private_data; 3216 card = (struct trident_card *) codec->private_data;
3220 3217
@@ -3240,8 +3237,7 @@ ali_ac97_write(struct ac97_codec *codec, u8 reg, u16 val)
3240 struct trident_card *card; 3237 struct trident_card *card;
3241 3238
3242 /* Added by Matt Wu */ 3239 /* Added by Matt Wu */
3243 if (!codec) 3240 BUG_ON(!codec);
3244 BUG();
3245 3241
3246 card = (struct trident_card *) codec->private_data; 3242 card = (struct trident_card *) codec->private_data;
3247 3243