diff options
author | Joe Perches <joe@perches.com> | 2010-09-05 17:31:11 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-09-06 21:48:43 -0400 |
commit | b31fa5bad576cd8180a5ad70c648333b44320d44 (patch) | |
tree | b31239e8828e7e5b36ef85a0715ababc4f556e42 /net/caif/cfvidl.c | |
parent | a0ece28539d49c9bdcc6da0bbb26771dceb57581 (diff) |
net/caif: Use pr_fmt
This patch standardizes caif message logging prefixes.
Add #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__
Add missing "\n"s to some logging messages
Convert pr_warning to pr_warn
This changes the logging message prefix from CAIF: to caif:
for all uses but caif_socket.c and chnl_net.c. Those now use
their filename without extension.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/caif/cfvidl.c')
-rw-r--r-- | net/caif/cfvidl.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/caif/cfvidl.c b/net/caif/cfvidl.c index ada6ee2d48f5..bf6fef2a0eff 100644 --- a/net/caif/cfvidl.c +++ b/net/caif/cfvidl.c | |||
@@ -4,6 +4,8 @@ | |||
4 | * License terms: GNU General Public License (GPL) version 2 | 4 | * License terms: GNU General Public License (GPL) version 2 |
5 | */ | 5 | */ |
6 | 6 | ||
7 | #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ | ||
8 | |||
7 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
8 | #include <linux/types.h> | 10 | #include <linux/types.h> |
9 | #include <linux/slab.h> | 11 | #include <linux/slab.h> |
@@ -21,7 +23,7 @@ struct cflayer *cfvidl_create(u8 channel_id, struct dev_info *dev_info) | |||
21 | { | 23 | { |
22 | struct cfsrvl *vid = kmalloc(sizeof(struct cfsrvl), GFP_ATOMIC); | 24 | struct cfsrvl *vid = kmalloc(sizeof(struct cfsrvl), GFP_ATOMIC); |
23 | if (!vid) { | 25 | if (!vid) { |
24 | pr_warning("CAIF: %s(): Out of memory\n", __func__); | 26 | pr_warn("Out of memory\n"); |
25 | return NULL; | 27 | return NULL; |
26 | } | 28 | } |
27 | caif_assert(offsetof(struct cfsrvl, layer) == 0); | 29 | caif_assert(offsetof(struct cfsrvl, layer) == 0); |
@@ -38,7 +40,7 @@ static int cfvidl_receive(struct cflayer *layr, struct cfpkt *pkt) | |||
38 | { | 40 | { |
39 | u32 videoheader; | 41 | u32 videoheader; |
40 | if (cfpkt_extr_head(pkt, &videoheader, 4) < 0) { | 42 | if (cfpkt_extr_head(pkt, &videoheader, 4) < 0) { |
41 | pr_err("CAIF: %s(): Packet is erroneous!\n", __func__); | 43 | pr_err("Packet is erroneous!\n"); |
42 | cfpkt_destroy(pkt); | 44 | cfpkt_destroy(pkt); |
43 | return -EPROTO; | 45 | return -EPROTO; |
44 | } | 46 | } |