Merge branch 'master' into csb1725

[mv-sheeva.git] / net / caif / caif_dev.c

diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c
index 0b586e9d1378fb209e2f377354938788abfd1ad8..a42a408306e4a1c038aa6ad0d8fb3d0e2f923aa9 100644 (file)
--- a/net/caif/caif_dev.c
+++ b/net/caif/caif_dev.c
@@ -9,6 +9,8 @@
  *  and Sakari Ailus <sakari.ailus@nokia.com>
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__
+
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -171,7 +173,7 @@ static int receive(struct sk_buff *skb, struct net_device *dev,
        net = dev_net(dev);
        pkt = cfpkt_fromnative(CAIF_DIR_IN, skb);
        caifd = caif_get(dev);
-       if (!caifd || !caifd->layer.up || !caifd->layer.up->ctrlcmd)
+       if (!caifd || !caifd->layer.up || !caifd->layer.up->receive)
                return NET_RX_DROP;
 
        if (caifd->layer.up->receive(caifd->layer.up, pkt))
@@ -214,7 +216,7 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,
 
        switch (what) {
        case NETDEV_REGISTER:
-               pr_info("CAIF: %s():register %s\n", __func__, dev->name);
+               netdev_info(dev, "register\n");
                caifd = caif_device_alloc(dev);
                if (caifd == NULL)
                        break;
@@ -225,14 +227,13 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,
                break;
 
        case NETDEV_UP:
-               pr_info("CAIF: %s(): up %s\n", __func__, dev->name);
+               netdev_info(dev, "up\n");
                caifd = caif_get(dev);
                if (caifd == NULL)
                        break;
                caifdev = netdev_priv(dev);
                if (atomic_read(&caifd->state) == NETDEV_UP) {
-                       pr_info("CAIF: %s():%s already up\n",
-                               __func__, dev->name);
+                       netdev_info(dev, "already up\n");
                        break;
                }
                atomic_set(&caifd->state, what);
@@ -273,7 +274,7 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,
                caifd = caif_get(dev);
                if (caifd == NULL)
                        break;
-               pr_info("CAIF: %s():going down %s\n", __func__, dev->name);
+               netdev_info(dev, "going down\n");
 
                if (atomic_read(&caifd->state) == NETDEV_GOING_DOWN ||
                        atomic_read(&caifd->state) == NETDEV_DOWN)
@@ -295,11 +296,10 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,
                caifd = caif_get(dev);
                if (caifd == NULL)
                        break;
-               pr_info("CAIF: %s(): down %s\n", __func__, dev->name);
+               netdev_info(dev, "down\n");
                if (atomic_read(&caifd->in_use))
-                       pr_warning("CAIF: %s(): "
-                                  "Unregistering an active CAIF device: %s\n",
-                                  __func__, dev->name);
+                       netdev_warn(dev,
+                                   "Unregistering an active CAIF device\n");
                cfcnfg_del_phy_layer(get_caif_conf(), &caifd->layer);
                dev_put(dev);
                atomic_set(&caifd->state, what);
@@ -307,7 +307,9 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,
 
        case NETDEV_UNREGISTER:
                caifd = caif_get(dev);
-               pr_info("CAIF: %s(): unregister %s\n", __func__, dev->name);
+               if (caifd == NULL)
+                       break;
+               netdev_info(dev, "unregister\n");
                atomic_set(&caifd->state, what);
                caif_device_destroy(dev);
                break;
@@ -391,7 +393,7 @@ static int __init caif_device_init(void)
        int result;
        cfg = cfcnfg_create();
        if (!cfg) {
-               pr_warning("CAIF: %s(): can't create cfcnfg.\n", __func__);
+               pr_warn("can't create cfcnfg\n");
                goto err_cfcnfg_create_failed;
        }
        result = register_pernet_device(&caif_net_ops);