[PATCH v2] Staging: rt2860: include KERN_* in printk

L. Alberto Giménez agimenez at sysvalve.es
Mon Dec 13 20:24:30 UTC 2010


On Mon, Dec 13, 2010 at 10:30:32AM -0800, Greg KH wrote:
> On Mon, Dec 13, 2010 at 12:58:44AM +0100, L. Alberto Giménez wrote:
> > Fix checkpatch complains.
> > 
> > The change of the DBGPRINT_ERR macro causes the change on the callers.
> 
> What change?

-#define DBGPRINT_ERR(Fmt)           \
-{                                   \
-    printk("ERROR! ");          \
-    printk Fmt;                  \
-}
+#define DBGPRINT_ERR(fmt, args...) printk(KERN_ERR fmt, ##args)

Recommended by Joe. I agree that it is cleaner and more compliant.
That macro needed that the callers use two parens, as in:

DBGPRINT_ERR(("MlmeInit failed, Status[=0x%08x]\n", Status));

With the introduced change, all calls to the DBGPRINT_ERR macro must be
translated to a regular single-parenthesized.

DBGPRINT_ERR("NICInitializeAdapter failed, Status[=0x%08x]\n", Status);

Yes, it's crap code, but I own an eeepc 901 and this was the perfect excuse to
get my harnds dirty :)

> 
> > 
> > Signed-off-by: L. Alberto Giménez <agimenez at sysvalve.es>
> > ---
> >  drivers/staging/rt2860/chip/rtmp_phy.h      |   14 ++++++------
> >  drivers/staging/rt2860/common/ba_action.c   |    6 ++--
> >  drivers/staging/rt2860/common/cmm_data.c    |    2 +-
> >  drivers/staging/rt2860/common/cmm_mac_pci.c |   10 ++++----
> >  drivers/staging/rt2860/common/cmm_mac_usb.c |    2 +-
> >  drivers/staging/rt2860/common/cmm_wpa.c     |   22 +++++++-----------
> >  drivers/staging/rt2860/common/ee_efuse.c    |   15 +++++++++---
> >  drivers/staging/rt2860/common/mlme.c        |   13 +++++------
> >  drivers/staging/rt2860/common/rt_rf.c       |    3 +-
> >  drivers/staging/rt2860/common/rtmp_init.c   |   24 ++++++++-----------
> >  drivers/staging/rt2860/common/rtmp_mcu.c    |    4 +-
> >  drivers/staging/rt2860/common/spectrum.c    |    2 +-
> >  drivers/staging/rt2860/pci_main_dev.c       |    2 +-
> >  drivers/staging/rt2860/rt_linux.c           |   21 ++++++++---------
> >  drivers/staging/rt2860/rt_linux.h           |    6 +----
> >  drivers/staging/rt2860/rt_main_dev.c        |    2 +-
> >  drivers/staging/rt2860/rt_usb.c             |   32 +++++++++++++-------------
> >  drivers/staging/rt2860/sta/assoc.c          |    2 +-
> >  drivers/staging/rt2860/sta/auth.c           |    3 +-
> >  drivers/staging/rt2860/sta/connect.c        |    3 +-
> >  drivers/staging/rt2860/sta/rtmp_data.c      |    2 +-
> >  drivers/staging/rt2860/sta/sync.c           |    6 ++--
> >  drivers/staging/rt2860/usb_main_dev.c       |   12 +++++-----
> >  23 files changed, 99 insertions(+), 109 deletions(-)
> 
> That's a lot of different changes all in one patch.  Care to break it up
> into a few different patches so it makes more sense?

I can break it up, but it made sense to me to group all KERN_* changes. That
included the DBGPRINT_ERR fix, that caused *a lot* of files to be changed as
well (to fix the macro call too).

Anyway, if you want me to split it up, please confirm :)

Regards,
-- 
L. Alberto Giménez
JabberID agimenez at jabber.sysvalve.es
GnuPG key ID 0x3BAABDE1



More information about the devel mailing list