From: Andrew Morton Date: Sat, 6 Jan 2007 00:36:35 +0000 (-0800) Subject: [PATCH] ip2 warning fix X-Git-Tag: v2.6.20-rc4~61 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2723f9603a8f8bb2cd8c7b581f7c94b8d75e3837;p=linux-2.6-omap-h63xx.git [PATCH] ip2 warning fix Make this: drivers/char/ip2/ip2main.c: In function 'ip2_loadmain': drivers/char/ip2/ip2main.c:654: warning: control may reach end of non-void function 'iiSetAddress' being inlined drivers/char/ip2/ip2main.c:808: warning: control may reach end of non-void function 'iiInitialize' being inlined go away. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/char/ip2/i2ellis.h b/drivers/char/ip2/i2ellis.h index 5eabe47b0bc..433305062fb 100644 --- a/drivers/char/ip2/i2ellis.h +++ b/drivers/char/ip2/i2ellis.h @@ -606,9 +606,9 @@ static int iiDownloadAll(i2eBordStrPtr, loadHdrStrPtr, int, int); // code and returning. // #define COMPLETE(pB,code) \ - if(1){ \ + do { \ pB->i2eError = code; \ return (code == I2EE_GOOD);\ - } + } while (0) #endif // I2ELLIS_H