diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index c7d3cdf450b..eb7fed9f4a0 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-22  Mike Frysinger  <vapier@gentoo.org>
+
+	* bfin-dis.c (OUTS): Remove p NULL check and txt NUL check.
+
 2011-02-22  Mike Frysinger  <vapier@gentoo.org>
 
 	* bfin-dis.c (print_insn_bfin): Change outf->fprintf_func to OUTS.
diff --git a/opcodes/bfin-dis.c b/opcodes/bfin-dis.c
index 9b834a41301..2357a2a45de 100644
--- a/opcodes/bfin-dis.c
+++ b/opcodes/bfin-dis.c
@@ -490,7 +490,7 @@ static const enum machine_registers decode_allregs[] =
 
 /* (arch.pm)arch_disassembler_functions.  */
 #ifndef OUTS
-#define OUTS(p, txt) ((p) ? (((txt)[0]) ? (p->fprintf_func)(p->stream, "%s", txt) :0) :0)
+#define OUTS(p, txt) (p)->fprintf_func ((p)->stream, "%s", txt)
 #endif
 
 static void