From: Jakub Kicinski Date: Mon, 23 Oct 2023 15:23:46 +0000 (-0700) Subject: net: remove else after return in dev_prep_valid_name() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ce4cfa2318afcd74cc41992e306a28fa04e5d484;p=linux.git net: remove else after return in dev_prep_valid_name() 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 Link: https://lore.kernel.org/r/20231023152346.3639749-7-kuba@kernel.org Signed-off-by: Jakub Kicinski --- diff --git a/net/core/dev.c b/net/core/dev.c index 0830f29672214..a37a932a3e145 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -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; }