Skip to content

Commit

Permalink
net: remove else after return in dev_prep_valid_name()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jakub Kicinski committed Oct 24, 2023
1 parent 70e1b14 commit ce4cfa2
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions net/core/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit ce4cfa2

Please sign in to comment.