]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
net: remove else after return in dev_prep_valid_name()
authorJakub Kicinski <kuba@kernel.org>
Mon, 23 Oct 2023 15:23:46 +0000 (08:23 -0700)
committerJakub Kicinski <kuba@kernel.org>
Tue, 24 Oct 2023 20:02:59 +0000 (13:02 -0700)
Remove unnecessary else clauses after return.
I copied this if / else construct from somewhere,
it makes the code harder to read.

Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Link: https://lore.kernel.org/r/20231023152346.3639749-7-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/core/dev.c

index 0830f29672214eb62d05a4ed322de60cc30e583e..a37a932a3e145e6b2270d36cdcd056f1a6937da1 100644 (file)
@@ -1131,14 +1131,13 @@ static int dev_prep_valid_name(struct net *net, struct net_device *dev,
        if (!dev_valid_name(want_name))
                return -EINVAL;
 
-       if (strchr(want_name, '%')) {
+       if (strchr(want_name, '%'))
                return __dev_alloc_name(net, want_name, out_name);
-       } else if (netdev_name_in_use(net, want_name)) {
+
+       if (netdev_name_in_use(net, want_name))
                return -dup_errno;
-       } else if (out_name != want_name) {
+       if (out_name != want_name)
                strscpy(out_name, want_name, IFNAMSIZ);
-       }
-
        return 0;
 }