Re: [PATCH 06/10] drivers/input/serio/i8042: Use pr_<level>, pr_fmt. Fix dbg and __FILE__ use

[Dmitry Torokhov <dmitry.torokhov@gmail.com>]

On Tuesday, October 26, 2010 04:25:31 pm Joe Perches wrote:
> On Tue, 2010-10-26 at 08:50 -0700, Dmitry Torokhov wrote:
> > Hi Joe,
> 
> Hi Dmitry.
> 
> > On Mon, Oct 25, 2010 at 07:44:24PM -0700, Joe Perches wrote:
> > > Standardized message logging prefixes.
> > > Removed \n from dbg macro, added \n to each dbg call site.
> > 
> > Did you test it? It looks for call like:
> > > +             dbg("%02x <- i8042 (flush, %s)\n",
> > > +                 data, str & I8042_STR_AUXDATA ? "aux" : "kbd");
> > 
> > the result will be:
> > printk(KERN_DEBUG "i8042: %02x <- i8042 (flush, %s)\n [%d]", ...)
> > which is not exactly what you want...
> 
> Right.  My mistake.
> I compile tested only and didn't notice the badly formed string.
> 
> Mind if I move the time to the front like this?
> 
> +#define dbg(format, arg...)                                            \
> +do {									\
> +	if (i8042_debug)						\
> +		printk(KERN_DEBUG KBUILD_MODNAME ": [%d]" format),	\
> +                      (int)(jiffies - i8042_start_time), ##arg);	\
> +} while (0)

Another option would be to leave '\n' in dbg() and leave most of the
callers as is.

Thanks.

-- 
Dmitry