ax25: more common return path joining

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ax25/ax25_iface.c b/net/ax25/ax25_iface.c
index 8443af5..71338f1 100644 (file)
--- a/net/ax25/ax25_iface.c
+++ b/net/ax25/ax25_iface.c
@@ -61,27 +61,24 @@ void ax25_protocol_release(unsigned int pid)
 
        write_lock_bh(&protocol_list_lock);
        protocol = protocol_list;
-       if (protocol == NULL) {
-               write_unlock_bh(&protocol_list_lock);
-               return;
-       }
+       if (protocol == NULL)
+               goto out;
 
        if (protocol->pid == pid) {
                protocol_list = protocol->next;
-               write_unlock_bh(&protocol_list_lock);
-               return;
+               goto out;
        }
 
        while (protocol != NULL && protocol->next != NULL) {
                if (protocol->next->pid == pid) {
                        s = protocol->next;
                        protocol->next = protocol->next->next;
-                       write_unlock_bh(&protocol_list_lock);
-                       return;
+                       goto out;
                }
 
                protocol = protocol->next;
        }
+out:
        write_unlock_bh(&protocol_list_lock);
 }