Commit b567edbf authored by Mark Starovoytov's avatar Mark Starovoytov Committed by David S. Miller
Browse files

net: atlantic: align return value of ver_match function with function name 



This patch aligns the return value of hw_atl_utils_ver_match function with
its name.
Change the return type to bool, because it's better aligned with the actual
usage. Return true when the version matches, false otherwise.

Signed-off-by: default avatarMark Starovoytov <mstarovoitov@marvell.com>
Signed-off-by: default avatarIgor Russkikh <irusskikh@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 11f3c1f5

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c

+13 −16
Original line number Diff line number Diff line
@@ -72,14 +72,11 @@ int hw_atl_utils_initfw(struct aq_hw_s *self, const struct aq_fw_ops **fw_ops) 


	self->fw_ver_actual = hw_atl_utils_get_fw_version(self);



	if (hw_atl_utils_ver_match(HW_ATL_FW_VER_1X,

				   self->fw_ver_actual) == 0) {

	if (hw_atl_utils_ver_match(HW_ATL_FW_VER_1X, self->fw_ver_actual)) {

		*fw_ops = &aq_fw_1x_ops;

	} else if (hw_atl_utils_ver_match(HW_ATL_FW_VER_2X,

					  self->fw_ver_actual) == 0) {

	} else if (hw_atl_utils_ver_match(HW_ATL_FW_VER_2X, self->fw_ver_actual)) {

		*fw_ops = &aq_fw_2x_ops;

	} else if (hw_atl_utils_ver_match(HW_ATL_FW_VER_3X,

					  self->fw_ver_actual) == 0) {

	} else if (hw_atl_utils_ver_match(HW_ATL_FW_VER_3X, self->fw_ver_actual)) {

		*fw_ops = &aq_fw_2x_ops;

	} else {

		aq_pr_err("Bad FW version detected: %x\n",
@@ -262,7 +259,7 @@ int hw_atl_utils_soft_reset(struct aq_hw_s *self) 
	/* FW 1.x may bootup in an invalid POWER state (WOL feature).

	 * We should work around this by forcing its state back to DEINIT

	 */

	if (!hw_atl_utils_ver_match(HW_ATL_FW_VER_1X,

	if (hw_atl_utils_ver_match(HW_ATL_FW_VER_1X,

				   aq_hw_read_reg(self,

						  HW_ATL_MPI_FW_VERSION))) {

		int err = 0;
@@ -434,20 +431,20 @@ int hw_atl_write_fwsettings_dwords(struct aq_hw_s *self, u32 offset, u32 *p, 
					     p, cnt, MCP_AREA_SETTINGS);

}



int hw_atl_utils_ver_match(u32 ver_expected, u32 ver_actual)

bool hw_atl_utils_ver_match(u32 ver_expected, u32 ver_actual)

{

	const u32 dw_major_mask = 0xff000000U;

	const u32 dw_minor_mask = 0x00ffffffU;

	int err = 0;

	bool ver_match;



	err = (dw_major_mask & (ver_expected ^ ver_actual)) ? -EOPNOTSUPP : 0;

	if (err < 0)

	ver_match = (dw_major_mask & (ver_expected ^ ver_actual)) ? false : true;

	if (!ver_match)

		goto err_exit;

	err = ((dw_minor_mask & ver_expected) > (dw_minor_mask & ver_actual)) ?

		-EOPNOTSUPP : 0;

	ver_match = ((dw_minor_mask & ver_expected) > (dw_minor_mask & ver_actual)) ?

		false : true;



err_exit:

	return err;

	return ver_match;

}



static int hw_atl_utils_init_ucp(struct aq_hw_s *self,

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h

+1 −1
Original line number Diff line number Diff line
@@ -635,7 +635,7 @@ int hw_atl_utils_fw_rpc_call(struct aq_hw_s *self, unsigned int rpc_size); 
int hw_atl_utils_fw_rpc_wait(struct aq_hw_s *self,

			     struct hw_atl_utils_fw_rpc **rpc);



int hw_atl_utils_ver_match(u32 ver_expected, u32 ver_actual);

bool hw_atl_utils_ver_match(u32 ver_expected, u32 ver_actual);



extern const struct aq_fw_ops aq_fw_1x_ops;

extern const struct aq_fw_ops aq_fw_2x_ops;

drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils.c

+1 −2
Original line number Diff line number Diff line
@@ -36,8 +36,7 @@ int hw_atl2_utils_initfw(struct aq_hw_s *self, const struct aq_fw_ops **fw_ops) 


	self->fw_ver_actual = hw_atl2_utils_get_fw_version(self);



	if (hw_atl_utils_ver_match(HW_ATL2_FW_VER_1X,

				   self->fw_ver_actual) == 0) {

	if (hw_atl_utils_ver_match(HW_ATL2_FW_VER_1X, self->fw_ver_actual)) {

		*fw_ops = &aq_a2_fw_ops;

	} else {

		aq_pr_err("Bad FW version detected: %x, but continue\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE