ax25: merge repeat codes in ax25_dev_device_down()

Merge repeat codes to reduce the duplication.

Signed-off-by: Lu Wei <luwei32@huawei.com>
Link: https://lore.kernel.org/r/20220516062804.254742-1-luwei32@huawei.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/net/ax25/ax25_dev.c b/net/ax25/ax25_dev.c
index d2a244e1c260f3d316237f0aea2d0ec80f60570f..b80fccbac62ab175c0f2ea3efd91ec9c7bffd6e1 100644 (file)
--- a/net/ax25/ax25_dev.c
+++ b/net/ax25/ax25_dev.c
@@ -115,23 +115,13 @@ void ax25_dev_device_down(struct net_device *dev)
 
        if ((s = ax25_dev_list) == ax25_dev) {
                ax25_dev_list = s->next;
-               spin_unlock_bh(&ax25_dev_lock);
-               ax25_dev_put(ax25_dev);
-               dev->ax25_ptr = NULL;
-               dev_put_track(dev, &ax25_dev->dev_tracker);
-               ax25_dev_put(ax25_dev);
-               return;
+               goto unlock_put;
        }
 
        while (s != NULL && s->next != NULL) {
                if (s->next == ax25_dev) {
                        s->next = ax25_dev->next;
-                       spin_unlock_bh(&ax25_dev_lock);
-                       ax25_dev_put(ax25_dev);
-                       dev->ax25_ptr = NULL;
-                       dev_put_track(dev, &ax25_dev->dev_tracker);
-                       ax25_dev_put(ax25_dev);
-                       return;
+                       goto unlock_put;
                }
 
                s = s->next;
@@ -139,6 +129,14 @@ void ax25_dev_device_down(struct net_device *dev)
        spin_unlock_bh(&ax25_dev_lock);
        dev->ax25_ptr = NULL;
        ax25_dev_put(ax25_dev);
+       return;
+
+unlock_put:
+       spin_unlock_bh(&ax25_dev_lock);
+       ax25_dev_put(ax25_dev);
+       dev->ax25_ptr = NULL;
+       dev_put_track(dev, &ax25_dev->dev_tracker);
+       ax25_dev_put(ax25_dev);
 }
 
 int ax25_fwd_ioctl(unsigned int cmd, struct ax25_fwd_struct *fwd)