浏览代码

iwlwifi: mvm: replace the number of blocks calculation

The logic in the paging calculations is a bit hard to
follow. Replace it with a kernel define.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Sara Sharon 8 年之前
父节点
当前提交
850fe9af62
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      drivers/net/wireless/intel/iwlwifi/mvm/fw.c

+ 2 - 2
drivers/net/wireless/intel/iwlwifi/mvm/fw.c

@@ -270,8 +270,8 @@ static int iwl_alloc_fw_paging_mem(struct iwl_mvm *mvm,
 	BUILD_BUG_ON(BIT(BLOCK_2_EXP_SIZE) != PAGING_BLOCK_SIZE);
 	BUILD_BUG_ON(BIT(BLOCK_2_EXP_SIZE) != PAGING_BLOCK_SIZE);
 
 
 	num_of_pages = image->paging_mem_size / FW_PAGING_SIZE;
 	num_of_pages = image->paging_mem_size / FW_PAGING_SIZE;
-	mvm->num_of_paging_blk = ((num_of_pages - 1) /
-				    NUM_OF_PAGE_PER_GROUP) + 1;
+	mvm->num_of_paging_blk =
+		DIV_ROUND_UP(num_of_pages, NUM_OF_PAGE_PER_GROUP);
 	mvm->num_of_pages_in_last_blk =
 	mvm->num_of_pages_in_last_blk =
 		num_of_pages -
 		num_of_pages -
 		NUM_OF_PAGE_PER_GROUP * (mvm->num_of_paging_blk - 1);
 		NUM_OF_PAGE_PER_GROUP * (mvm->num_of_paging_blk - 1);