diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-10-23 08:23:46 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-10-24 13:02:59 -0700 |
| commit | ce4cfa2318afcd74cc41992e306a28fa04e5d484 (patch) | |
| tree | ff9a6cbabbd721ea8fefb98d8ea6aab2a4f43cf2 /net/core/dev.c | |
| parent | 70e1b14c1bcbbb0854311ff8bed6cf4db75d5f05 (diff) | |
| download | lwn-ce4cfa2318afcd74cc41992e306a28fa04e5d484.tar.gz lwn-ce4cfa2318afcd74cc41992e306a28fa04e5d484.zip | |
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 <jiri@nvidia.com>
Link: https://lore.kernel.org/r/20231023152346.3639749-7-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 0830f2967221..a37a932a3e14 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; } |