lkml.org 
[lkml]   [2010]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: [PATCH 3/3] Staging: rt2860: include KERN_* in printk
From
Date
On Sun, 2010-12-12 at 18:56 +0100, L. Alberto Giménez wrote:
> Fix checkpatch complains
> diff --git a/drivers/staging/rt2860/common/ee_efuse.c b/drivers/staging/rt2860/common/ee_efuse.c
[]
> @@ -281,8 +281,8 @@ int set_eFusedump_Proc(struct rt_rtmp_adapter *pAd, char *arg)
>
> eFuseReadPhysical(pAd, &InBuf[0], 4, &InBuf[2], 2);
> if (i % 4 == 0)
> - printk("\nBlock %x:", i / 8);
> - printk("%04x ", InBuf[2]);
> + printk(KERN_DEBUG "\nBlock %x:", i / 8);
> + printk(KERN_DEBUG "%04x ", InBuf[2]);
> }
> return TRUE;
> }

Not quite. Use:

(before the for)
printk(KERN_DEBUG "Block 0: ");

for(...)
[]
if (i && i % 4 == 0) {
printk(KERN_CONT "\n");
printk(KERN_DEBUG "Block %x: ", i / 8);
}
printk(KERN_CONT " %04x", InBuf[2]);
}
printk(KERN_CONT "\n");

> diff --git a/drivers/staging/rt2860/pci_main_dev.c b/drivers/staging/rt2860/pci_main_dev.c
> index 628559d..1949acd 100644
> --- a/drivers/staging/rt2860/pci_main_dev.c
> +++ b/drivers/staging/rt2860/pci_main_dev.c
> @@ -202,7 +202,7 @@ static int rt2860_resume(struct pci_dev *pci_dev)
>
> /* initialize device before it's used by a driver */
> if (pci_enable_device(pci_dev)) {
> - printk("pci enable fail!\n");
> + printk(KERN_ERR "rt2860: pci enable fail!\n");
> return 0;
> }
>
> diff --git a/drivers/staging/rt2860/rt_linux.c b/drivers/staging/rt2860/rt_linux.c
[]
> @@ -343,9 +343,8 @@ int RTMPAllocateNdisPacket(struct rt_rtmp_adapter *pAd,
> RTMP_PKT_TAIL_PADDING);
> if (pPacket == NULL) {
> *ppPacket = NULL;
> -#ifdef DEBUG
> - printk("RTMPAllocateNdisPacket Fail\n");
> -#endif
> + printk(KERN_DEBUG "RTMPAllocateNdisPacket Fail\n");

Behavior change.
Using pr_devel would be exactly the same.
Using pr_debug would enable dynamic debug.

> @@ -601,15 +600,15 @@ void hex_dump(char *str, unsigned char *pSrcBufVA, unsigned int SrcBufLen)
> return;
>
> pt = pSrcBufVA;
> - printk("%s: %p, len = %d\n", str, pSrcBufVA, SrcBufLen);
> + printk(KERN_DEBUG "%s: %p, len = %d\n", str, pSrcBufVA, SrcBufLen);
> for (x = 0; x < SrcBufLen; x++) {
> if (x % 16 == 0)
> - printk("0x%04x : ", x);
> - printk("%02x ", ((unsigned char)pt[x]));
> + printk(KERN_DEBUG "0x%04x : ", x);
> + printk(KERN_DEBUG "%02x ", ((unsigned char)pt[x]));
> if (x % 16 == 15)
> - printk("\n");
> + printk(KERN_DEBUG "\n");
> }
> - printk("\n");
> + printk(KERN_DEBUG "\n");

This should use print_hex_dump

> diff --git a/drivers/staging/rt2860/rt_linux.h b/drivers/staging/rt2860/rt_linux.h
[]
> #define DBGPRINT_ERR(Fmt) \
> { \
> - printk("ERROR! "); \
> + printk(KERN_ERR "ERROR! "); \
> printk Fmt; \
> }

Better ways to do this:

#define DBGPRINT_ERR(fmt, args...) printk(KERN_ERR fmt, ##args)
or
#define DBGPRINT_ERR(fmt, ...) printk(KERN_ERR fmt, ##__VA_ARGS__)

and remove the unnecessary () at the call sites.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2010-12-12 20:07    [W:0.095 / U:1.008 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site