]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
qed: Avoid implicit enum conversion in qed_roce_mode_to_flavor
authorNathan Chancellor <natechancellor@gmail.com>
Mon, 24 Sep 2018 21:34:53 +0000 (14:34 -0700)
committerJuerg Haefliger <juergh@canonical.com>
Wed, 24 Jul 2019 01:54:46 +0000 (19:54 -0600)
commit984373d8f567795349b3d1730ea9b10aa1c00cb4
treed4e1b0a56a0a05d36096deb782f75bf4b85f3f25
parent5c8aa55ef0d4e7b431a8c81574090cb3276cc0d2
qed: Avoid implicit enum conversion in qed_roce_mode_to_flavor

BugLink: https://bugs.launchpad.net/bugs/1836654
[ Upstream commit d3a315795b4ce8b105a64a90699103121bde04a8 ]

Clang warns when one enumerated type is implicitly converted to another.

drivers/net/ethernet/qlogic/qed/qed_roce.c:153:12: warning: implicit
conversion from enumeration type 'enum roce_mode' to different
enumeration type 'enum roce_flavor' [-Wenum-conversion]
                flavor = ROCE_V2_IPV6;
                       ~ ^~~~~~~~~~~~
drivers/net/ethernet/qlogic/qed/qed_roce.c:156:12: warning: implicit
conversion from enumeration type 'enum roce_mode' to different
enumeration type 'enum roce_flavor' [-Wenum-conversion]
                flavor = MAX_ROCE_MODE;
                       ~ ^~~~~~~~~~~~~
2 warnings generated.

Use the appropriate values from the expected type, roce_flavor:

ROCE_V2_IPV6 = RROCE_IPV6 = 2
MAX_ROCE_MODE = MAX_ROCE_FLAVOR = 3

While we're add it, ditch the local variable flavor, we can just return
the value directly from the switch statement.

Link: https://github.com/ClangBuiltLinux/linux/issues/125
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
drivers/net/ethernet/qlogic/qed/qed_roce.c