Staging: ozwpan: reduce indent levels in oz_binding_add().
authorSalym Senyonga <salymsash@gmail.com>
Sat, 25 Jan 2014 09:54:40 +0000 (12:54 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 7 Feb 2014 18:59:38 +0000 (10:59 -0800)
When hit error then we can return immediately. This makes the code
simpler and lets us remove some indenting.

Signed-off-by: Salym Senyonga <salymsash@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/ozwpan/ozproto.c

index 5d965cf06d59c60c717e5b9b87b74605f720ec5c..c303ae144083cb554595e27481d7bfa9be9d89fc 100644 (file)
@@ -665,31 +665,29 @@ void oz_binding_add(const char *net_dev)
        struct oz_binding *binding;
 
        binding = kmalloc(sizeof(struct oz_binding), GFP_KERNEL);
-       if (binding) {
-               binding->ptype.type = __constant_htons(OZ_ETHERTYPE);
-               binding->ptype.func = oz_pkt_recv;
-               if (net_dev && *net_dev) {
-                       memcpy(binding->name, net_dev, OZ_MAX_BINDING_LEN);
-                       oz_dbg(ON, "Adding binding: %s\n", net_dev);
-                       binding->ptype.dev =
-                               dev_get_by_name(&init_net, net_dev);
-                       if (binding->ptype.dev == NULL) {
-                               oz_dbg(ON, "Netdev %s not found\n", net_dev);
-                               kfree(binding);
-                               binding = NULL;
-                       }
-               } else {
-                       oz_dbg(ON, "Binding to all netcards\n");
-                       memset(binding->name, 0, OZ_MAX_BINDING_LEN);
-                       binding->ptype.dev = NULL;
-               }
-               if (binding) {
-                       dev_add_pack(&binding->ptype);
-                       spin_lock_bh(&g_binding_lock);
-                       list_add_tail(&binding->link, &g_binding);
-                       spin_unlock_bh(&g_binding_lock);
+       if (!binding)
+               return;
+
+       binding->ptype.type = __constant_htons(OZ_ETHERTYPE);
+       binding->ptype.func = oz_pkt_recv;
+       if (net_dev && *net_dev) {
+               memcpy(binding->name, net_dev, OZ_MAX_BINDING_LEN);
+               oz_dbg(ON, "Adding binding: %s\n", net_dev);
+               binding->ptype.dev = dev_get_by_name(&init_net, net_dev);
+               if (binding->ptype.dev == NULL) {
+                       oz_dbg(ON, "Netdev %s not found\n", net_dev);
+                       kfree(binding);
+                       return;
                }
+       } else {
+               oz_dbg(ON, "Binding to all netcards\n");
+               memset(binding->name, 0, OZ_MAX_BINDING_LEN);
+               binding->ptype.dev = NULL;
        }
+       dev_add_pack(&binding->ptype);
+       spin_lock_bh(&g_binding_lock);
+       list_add_tail(&binding->link, &g_binding);
+       spin_unlock_bh(&g_binding_lock);
 }
 
 /*