Re: [PATCH 3/5] usb: Convert dbg to pr_eliminated and pr_debug

Greg Kroah-Hartman
2012-06-18T15:23:23Z

On Sun, Jun 17, 2012 at 07:25:10PM -0700, Joe Perches wrote:
> Change the dbg macro to use pr_eliminated when not
> DEBUG and pr_debug with DEBUG so dynamic_debug can
> be used.
>
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
> include/linux/usb.h | 12 +++++-------
> 1 files changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/include/linux/usb.h b/include/linux/usb.h
> index f717fbd..56b88b8 100644
> --- a/include/linux/usb.h
> +++ b/include/linux/usb.h
> @@ -1714,14 +1714,12 @@ extern void usb_register_notify(struct notifier_block *nb);
> extern void usb_unregister_notify(struct notifier_block *nb);
>
> #ifdef DEBUG
> -#define dbg(format, arg...) \
> - printk(KERN_DEBUG "%s: " format "\n", __FILE__, ##arg)
> +#define dbg(format, ...) \
> + pr_debug("%s: " format "\n", __FILE__, ##__VA_ARGS__)

No, I really want to delete this macro entirely, and am slowly working
toward that, moving drivers to use the correct dev_dbg() macro instead.

> #else
> -#define dbg(format, arg...) \
> -do { \
> - if (0) \
> - printk(KERN_DEBUG "%s: " format "\n", __FILE__, ##arg); \
> -} while (0)
> +#define dbg(format, ...) \
> + printk_eliminated(KERN_DEBUG "%s: " format "\n", \
> + __FILE__, ##__VA_ARGS)

As Paul pointed out, this breaks the build, please build test your
patches before sending them out, it just wastes our time otherwise :(

greg k-h