RDS: Fix locking in send on m_rs_lock

[firefly-linux-kernel-4.4.55.git] / net / caif / cfutill.c

diff --git a/net/caif/cfutill.c b/net/caif/cfutill.c
index 02795aff57a426fbbd1080214f46c5a1fb569d34..efad410e4c829d098fd7b02f2aaa106d4ea8f782 100644 (file)
--- a/net/caif/cfutill.c
+++ b/net/caif/cfutill.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/slab.h>
@@ -26,7 +28,7 @@ struct cflayer *cfutill_create(u8 channel_id, struct dev_info *dev_info)
 {
        struct cfsrvl *util = kmalloc(sizeof(struct cfsrvl), GFP_ATOMIC);
        if (!util) {
-               pr_warning("CAIF: %s(): Out of memory\n", __func__);
+               pr_warn("Out of memory\n");
                return NULL;
        }
        caif_assert(offsetof(struct cfsrvl, layer) == 0);
@@ -47,7 +49,7 @@ static int cfutill_receive(struct cflayer *layr, struct cfpkt *pkt)
        caif_assert(layr->up->receive != NULL);
        caif_assert(layr->up->ctrlcmd != NULL);
        if (cfpkt_extr_head(pkt, &cmd, 1) < 0) {
-               pr_err("CAIF: %s(): Packet is erroneous!\n", __func__);
+               pr_err("Packet is erroneous!\n");
                cfpkt_destroy(pkt);
                return -EPROTO;
        }
@@ -64,16 +66,14 @@ static int cfutill_receive(struct cflayer *layr, struct cfpkt *pkt)
                cfpkt_destroy(pkt);
                return 0;
        case UTIL_REMOTE_SHUTDOWN:      /* Remote Shutdown Request */
-               pr_err("CAIF: %s(): REMOTE SHUTDOWN REQUEST RECEIVED\n",
-                       __func__);
+               pr_err("REMOTE SHUTDOWN REQUEST RECEIVED\n");
                layr->ctrlcmd(layr, CAIF_CTRLCMD_REMOTE_SHUTDOWN_IND, 0);
                service->open = false;
                cfpkt_destroy(pkt);
                return 0;
        default:
                cfpkt_destroy(pkt);
-               pr_warning("CAIF: %s(): Unknown service control %d (0x%x)\n",
-                          __func__, cmd, cmd);
+               pr_warn("Unknown service control %d (0x%x)\n", cmd, cmd);
                return -EPROTO;
        }
 }