From: Dan Streetman Subject: [PATCH] crypto: 842 - remove WARN inside printk Date: Mon, 21 Dec 2015 12:52:10 -0500 Message-ID: <1450720330-30676-1-git-send-email-ddstreet@ieee.org> References: <5671C83C.7@infradead.org> Cc: Randy Dunlap , Stephen Rothwell , Haren Myneni , linux-next@vger.kernel.org, linux-crypto@vger.kernel.org, linux-kernel , Dan Streetman To: Herbert Xu Return-path: In-Reply-To: <5671C83C.7@infradead.org> Sender: linux-next-owner@vger.kernel.org List-Id: linux-crypto.vger.kernel.org Remove the WARN() from the beN_to_cpu macro, which is used as a param to a pr_debug() call. With a certain kernel config, this printk-in-printk results in the no_printk() macro trying to recursively call the no_printk() macro, and since macros can't recursively call themselves a build error results. Reported-by: Randy Dunlap Signed-off-by: Dan Streetman --- lib/842/842_decompress.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/842/842_decompress.c b/lib/842/842_decompress.c index 8881dad..a7f278d 100644 --- a/lib/842/842_decompress.c +++ b/lib/842/842_decompress.c @@ -69,7 +69,7 @@ struct sw842_param { ((s) == 2 ? be16_to_cpu(get_unaligned((__be16 *)d)) : \ (s) == 4 ? be32_to_cpu(get_unaligned((__be32 *)d)) : \ (s) == 8 ? be64_to_cpu(get_unaligned((__be64 *)d)) : \ - WARN(1, "pr_debug param err invalid size %x\n", s)) + 0) static int next_bits(struct sw842_param *p, u64 *d, u8 n); @@ -202,10 +202,14 @@ static int __do_index(struct sw842_param *p, u8 size, u8 bits, u64 fsize) return -EINVAL; } - pr_debug("index%x to %lx off %lx adjoff %lx tot %lx data %lx\n", - size, (unsigned long)index, (unsigned long)(index * size), - (unsigned long)offset, (unsigned long)total, - (unsigned long)beN_to_cpu(&p->ostart[offset], size)); + if (size != 2 && size != 4 && size != 8) + WARN(1, "__do_index invalid size %x\n", size); + else + pr_debug("index%x to %lx off %lx adjoff %lx tot %lx data %lx\n", + size, (unsigned long)index, + (unsigned long)(index * size), (unsigned long)offset, + (unsigned long)total, + (unsigned long)beN_to_cpu(&p->ostart[offset], size)); memcpy(p->out, &p->ostart[offset], size); p->out += size; -- 2.5.0