Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[karo-tx-linux.git] / net / caif / cfsrvl.c

diff --git a/net/caif/cfsrvl.c b/net/caif/cfsrvl.c
index f40939a91211b8e2b6ba985f2e1562064723e681..ab5e542526bf4e9e2f65562e56a97ccb96ba85bf 100644 (file)
--- a/net/caif/cfsrvl.c
+++ b/net/caif/cfsrvl.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/kernel.h>
 #include <linux/types.h>
 #include <linux/errno.h>
@@ -79,8 +81,7 @@ static void cfservl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl,
                layr->up->ctrlcmd(layr->up, ctrl, phyid);
                break;
        default:
-               pr_warning("CAIF: %s(): "
-                          "Unexpected ctrl in cfsrvl (%d)\n", __func__, ctrl);
+               pr_warn("Unexpected ctrl in cfsrvl (%d)\n", ctrl);
                /* We have both modem and phy flow on, send flow on */
                layr->up->ctrlcmd(layr->up, ctrl, phyid);
                service->phy_flow_on = true;
@@ -107,14 +108,12 @@ static int cfservl_modemcmd(struct cflayer *layr, enum caif_modemcmd ctrl)
                        u8 flow_on = SRVL_FLOW_ON;
                        pkt = cfpkt_create(SRVL_CTRL_PKT_SIZE);
                        if (!pkt) {
-                               pr_warning("CAIF: %s(): Out of memory\n",
-                                       __func__);
+                               pr_warn("Out of memory\n");
                                return -ENOMEM;
                        }
 
                        if (cfpkt_add_head(pkt, &flow_on, 1) < 0) {
-                               pr_err("CAIF: %s(): Packet is erroneous!\n",
-                                       __func__);
+                               pr_err("Packet is erroneous!\n");
                                cfpkt_destroy(pkt);
                                return -EPROTO;
                        }
@@ -131,14 +130,12 @@ static int cfservl_modemcmd(struct cflayer *layr, enum caif_modemcmd ctrl)
                        u8 flow_off = SRVL_FLOW_OFF;
                        pkt = cfpkt_create(SRVL_CTRL_PKT_SIZE);
                        if (!pkt) {
-                               pr_warning("CAIF: %s(): Out of memory\n",
-                                       __func__);
+                               pr_warn("Out of memory\n");
                                return -ENOMEM;
                        }
 
                        if (cfpkt_add_head(pkt, &flow_off, 1) < 0) {
-                               pr_err("CAIF: %s(): Packet is erroneous!\n",
-                                       __func__);
+                               pr_err("Packet is erroneous!\n");
                                cfpkt_destroy(pkt);
                                return -EPROTO;
                        }