Commit cd2b7f83 authored Sep 30, 2018 by Nathan Chancellor Committed by Greg Kroah-Hartman Nov 25, 2019

cxgb4: Use proper enum in cxgb4_dcb_handle_fw_update



[ Upstream commit 3b0b8f0d9a259f6a428af63e7a77547325f8e081 ]

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

drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c:303:7: warning: implicit
conversion from enumeration type 'enum cxgb4_dcb_state' to different
enumeration type 'enum cxgb4_dcb_state_input' [-Wenum-conversion]
                         ? CXGB4_DCB_STATE_FW_ALLSYNCED
                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c:304:7: warning: implicit
conversion from enumeration type 'enum cxgb4_dcb_state' to different
enumeration type 'enum cxgb4_dcb_state_input' [-Wenum-conversion]
                         : CXGB4_DCB_STATE_FW_INCOMPLETE);
                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2 warnings generated.

Use the equivalent value of the expected type to silence Clang while
resulting in no functional change.

CXGB4_DCB_STATE_FW_INCOMPLETE = CXGB4_DCB_INPUT_FW_INCOMPLETE = 2
CXGB4_DCB_STATE_FW_ALLSYNCED = CXGB4_DCB_INPUT_FW_ALLSYNCED = 3

Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent a87ccca3

drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -266,8 +266,8 @@ void cxgb4_dcb_handle_fw_update(struct adapter *adap,
		enum cxgb4_dcb_state_input input =
		((pcmd->u.dcb.control.all_syncd_pkd &
		FW_PORT_CMD_ALL_SYNCD_F)
		? CXGB4_DCB_STATE_FW_ALLSYNCED
		: CXGB4_DCB_STATE_FW_INCOMPLETE);
		? CXGB4_DCB_INPUT_FW_ALLSYNCED
		: CXGB4_DCB_INPUT_FW_INCOMPLETE);

		if (dcb->dcb_version != FW_PORT_DCB_VER_UNKNOWN) {
		dcb_running_version = FW_PORT_CMD_DCB_VERSION_G(