xps: Transmit Packet Steering

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

diff --git a/net/caif/cfdgml.c b/net/caif/cfdgml.c
index ed9d53aff28053e5dd98bbaf9eb1ad8d3bb6b591..d3ed264ad6c42b932d84a721b270f88d0d6b574b 100644 (file)
--- a/net/caif/cfdgml.c
+++ b/net/caif/cfdgml.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>
@@ -26,7 +28,7 @@ struct cflayer *cfdgml_create(u8 channel_id, struct dev_info *dev_info)
 {
        struct cfsrvl *dgm = kmalloc(sizeof(struct cfsrvl), GFP_ATOMIC);
        if (!dgm) {
-               pr_warning("CAIF: %s(): Out of memory\n", __func__);
+               pr_warn("Out of memory\n");
                return NULL;
        }
        caif_assert(offsetof(struct cfsrvl, layer) == 0);
@@ -49,14 +51,14 @@ static int cfdgml_receive(struct cflayer *layr, struct cfpkt *pkt)
        caif_assert(layr->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;
        }
 
        if ((cmd & DGM_CMD_BIT) == 0) {
                if (cfpkt_extr_head(pkt, &dgmhdr, 3) < 0) {
-                       pr_err("CAIF: %s(): Packet is erroneous!\n", __func__);
+                       pr_err("Packet is erroneous!\n");
                        cfpkt_destroy(pkt);
                        return -EPROTO;
                }
@@ -75,8 +77,7 @@ static int cfdgml_receive(struct cflayer *layr, struct cfpkt *pkt)
                return 0;
        default:
                cfpkt_destroy(pkt);
-               pr_info("CAIF: %s(): Unknown datagram control %d (0x%x)\n",
-                       __func__, cmd, cmd);
+               pr_info("Unknown datagram control %d (0x%x)\n", cmd, cmd);
                return -EPROTO;
        }
 }