Looks reasonable to me - thanks.
Acked-by: Jonathan Woithe <jwoithe@xxxxxxxxxx>
On Mon, Mar 17, 2014 at 12:02:06PM +0100, Jean Delvare wrote:
> When CONFIG_FUJITSU_LAPTOP_DEBUG is disabled and W=1, the
> fujitsu-laptop driver builds with the following warnings:
>
> drivers/platform/x86/fujitsu-laptop.c: In function "bl_update_status":
> drivers/platform/x86/fujitsu-laptop.c:409:8: warning: suggest braces around empty body in an "if" statement [-Wempty-body]
> ret);
> ^
> drivers/platform/x86/fujitsu-laptop.c:418:8: warning: suggest braces around empty body in an "if" statement [-Wempty-body]
> ret);
> ^
>
> Rework the debug printk helper macro to get rid of these. I verified
> that this change has no effect on the generated binary, both in the
> debug and non-debug case.
>
> Signed-off-by: Jean Delvare <jdelvare@xxxxxxx>
> Cc: Jonathan Woithe <jwoithe@xxxxxxxxxx>
> Cc: Matthew Garrett <matthew.garrett@xxxxxxxxxx>
> ---
> drivers/platform/x86/fujitsu-laptop.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> --- linux-3.14-rc6.orig/drivers/platform/x86/fujitsu-laptop.c 2014-03-17 11:31:19.961145958 +0100
> +++ linux-3.14-rc6/drivers/platform/x86/fujitsu-laptop.c 2014-03-17 11:46:56.242465978 +0100
> @@ -129,15 +129,14 @@
> #define FUJLAPTOP_DBG_INFO 0x0004
> #define FUJLAPTOP_DBG_TRACE 0x0008
>
> -#define dbg_printk(a_dbg_level, format, arg...) \
> +#ifdef CONFIG_FUJITSU_LAPTOP_DEBUG
> +#define vdbg_printk(a_dbg_level, format, arg...) \
> do { if (dbg_level & a_dbg_level) \
> printk(FUJLAPTOP_DEBUG "%s: " format, __func__ , ## arg); \
> } while (0)
> -#ifdef CONFIG_FUJITSU_LAPTOP_DEBUG
> -#define vdbg_printk(a_dbg_level, format, arg...) \
> - dbg_printk(a_dbg_level, format, ## arg)
> #else
> -#define vdbg_printk(a_dbg_level, format, arg...)
> +#define vdbg_printk(a_dbg_level, format, arg...) \
> + do { } while (0)
> #endif
>
> /* Device controlling the backlight and associated keys */
>
>
> --
> Jean Delvare
> SUSE L3 Support
--
To unsubscribe from this list: send the line "unsubscribe platform-driver-x86" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
