Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4380b4e authored by Sharon Dvir's avatar Sharon Dvir Committed by Luca Coelho
Browse files

iwlwifi: change functions that can only return 0 to void 



Change iwl_set_ucode_api_flags(), iwl_set_ucode_capabilities() to be void.
No need to check returned values.
Found by Klocwork.

Signed-off-by: default avatarSharon Dvir <sharon.dvir@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 61d8c626

drivers/net/wireless/intel/iwlwifi/iwl-drv.c

+8 −16
Original line number Original line Diff line number Diff line
@@ -478,7 +478,7 @@ static int iwl_set_default_calib(struct iwl_drv *drv, const u8 *data) 
	return 0;

	return 0;

}

}





static int iwl_set_ucode_api_flags(struct iwl_drv *drv, const u8 *data,

static void iwl_set_ucode_api_flags(struct iwl_drv *drv, const u8 *data,

				    struct iwl_ucode_capabilities *capa)

				    struct iwl_ucode_capabilities *capa)

{

{

	const struct iwl_ucode_api *ucode_api = (void *)data;

	const struct iwl_ucode_api *ucode_api = (void *)data;
@@ -490,19 +490,16 @@ static int iwl_set_ucode_api_flags(struct iwl_drv *drv, const u8 *data, 
		IWL_ERR(drv,

		IWL_ERR(drv,

			"api flags index %d larger than supported by driver\n",

			"api flags index %d larger than supported by driver\n",

			api_index);

			api_index);

		/* don't return an error so we can load FW that has more bits */

		return;

		return 0;

	}

	}





	for (i = 0; i < 32; i++) {

	for (i = 0; i < 32; i++) {

		if (api_flags & BIT(i))

		if (api_flags & BIT(i))

			__set_bit(i + 32 * api_index, capa->_api);

			__set_bit(i + 32 * api_index, capa->_api);

	}

	}



	return 0;

}

}





static int iwl_set_ucode_capabilities(struct iwl_drv *drv, const u8 *data,

static void iwl_set_ucode_capabilities(struct iwl_drv *drv, const u8 *data,

				       struct iwl_ucode_capabilities *capa)

				       struct iwl_ucode_capabilities *capa)

{

{

	const struct iwl_ucode_capa *ucode_capa = (void *)data;

	const struct iwl_ucode_capa *ucode_capa = (void *)data;
@@ -514,16 +511,13 @@ static int iwl_set_ucode_capabilities(struct iwl_drv *drv, const u8 *data, 
		IWL_ERR(drv,

		IWL_ERR(drv,

			"capa flags index %d larger than supported by driver\n",

			"capa flags index %d larger than supported by driver\n",

			api_index);

			api_index);

		/* don't return an error so we can load FW that has more bits */

		return;

		return 0;

	}

	}





	for (i = 0; i < 32; i++) {

	for (i = 0; i < 32; i++) {

		if (api_flags & BIT(i))

		if (api_flags & BIT(i))

			__set_bit(i + 32 * api_index, capa->_capa);

			__set_bit(i + 32 * api_index, capa->_capa);

	}

	}



	return 0;

}

}





static int iwl_parse_v1_v2_firmware(struct iwl_drv *drv,

static int iwl_parse_v1_v2_firmware(struct iwl_drv *drv,
@@ -765,14 +759,12 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv, 
		case IWL_UCODE_TLV_API_CHANGES_SET:

		case IWL_UCODE_TLV_API_CHANGES_SET:

			if (tlv_len != sizeof(struct iwl_ucode_api))

			if (tlv_len != sizeof(struct iwl_ucode_api))

				goto invalid_tlv_len;

				goto invalid_tlv_len;

			if (iwl_set_ucode_api_flags(drv, tlv_data, capa))

			iwl_set_ucode_api_flags(drv, tlv_data, capa);

				goto tlv_error;

			break;

			break;

		case IWL_UCODE_TLV_ENABLED_CAPABILITIES:

		case IWL_UCODE_TLV_ENABLED_CAPABILITIES:

			if (tlv_len != sizeof(struct iwl_ucode_capa))

			if (tlv_len != sizeof(struct iwl_ucode_capa))

				goto invalid_tlv_len;

				goto invalid_tlv_len;

			if (iwl_set_ucode_capabilities(drv, tlv_data, capa))

			iwl_set_ucode_capabilities(drv, tlv_data, capa);

				goto tlv_error;

			break;

			break;

		case IWL_UCODE_TLV_INIT_EVTLOG_PTR:

		case IWL_UCODE_TLV_INIT_EVTLOG_PTR:

			if (tlv_len != sizeof(u32))

			if (tlv_len != sizeof(u32))