| Message ID | 20231020011856.3244410-7-kuba@kernel.org (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: deduplicate netdev name allocation | expand |
Fri, Oct 20, 2023 at 03:18:56AM CEST, kuba@kernel.org wrote: >Remove unnecessary else clauses after return. >I copied this if / else construct from somewhere, >it makes the code harder to read. > >Signed-off-by: Jakub Kicinski <kuba@kernel.org> Reviewed-by: Jiri Pirko <jiri@nvidia.com>
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)) { - return -dup_errno; - } else if (out_name != want_name) { - strscpy(out_name, want_name, IFNAMSIZ); - } + if (netdev_name_in_use(net, want_name)) + return -dup_errno; + if (out_name != want_name) + strscpy(out_name, want_name, IFNAMSIZ); return 0; }
Remove unnecessary else clauses after return. I copied this if / else construct from somewhere, it makes the code harder to read. Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- net/core/dev.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)