Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[net-next-2.6.git] / net / caif / cfrfml.c

diff --git a/net/caif/cfrfml.c b/net/caif/cfrfml.c
index 9a699242d104be7fbef70ed4560d6ca3a63ebda3..bde8481e8d2574dd939f84595f8e4354370aa5a7 100644 (file)
--- a/net/caif/cfrfml.c
+++ b/net/caif/cfrfml.c
@@ -4,6 +4,8 @@
  * License terms: GNU General Public License (GPL) version 2
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__
+
 #include <linux/stddef.h>
 #include <linux/spinlock.h>
 #include <linux/slab.h>
@@ -48,7 +50,7 @@ struct cflayer *cfrfml_create(u8 channel_id, struct dev_info *dev_info,
                kzalloc(sizeof(struct cfrfml), GFP_ATOMIC);
 
        if (!this) {
-               pr_warning("CAIF: %s(): Out of memory\n", __func__);
+               pr_warn("Out of memory\n");
                return NULL;
        }
 
@@ -178,9 +180,7 @@ out:
                        cfpkt_destroy(rfml->incomplete_frm);
                rfml->incomplete_frm = NULL;
 
-               pr_info("CAIF: %s(): "
-                               "Connection error %d triggered on RFM link\n",
-                               __func__, err);
+               pr_info("Connection error %d triggered on RFM link\n", err);
 
                /* Trigger connection error upon failure.*/
                layr->up->ctrlcmd(layr->up, CAIF_CTRLCMD_REMOTE_SHUTDOWN_IND,
@@ -280,9 +280,7 @@ static int cfrfml_transmit(struct cflayer *layr, struct cfpkt *pkt)
 out:
 
        if (err != 0) {
-               pr_info("CAIF: %s(): "
-                               "Connection error %d triggered on RFM link\n",
-                               __func__, err);
+               pr_info("Connection error %d triggered on RFM link\n", err);
                /* Trigger connection error upon failure.*/
 
                layr->up->ctrlcmd(layr->up, CAIF_CTRLCMD_REMOTE_SHUTDOWN_IND,