Commit 2310ae5c authored by Alan Cox's avatar Alan Cox Committed by Mauro Carvalho Chehab

[media] atomisp: remove NUM_OF_BLS

With the removal of the HAS_BL bootloader code the value of NUM_OF_BLS is an
invariant zero. So let's get rid of it.
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 5c9f9d60
...@@ -234,9 +234,9 @@ sh_css_load_firmware(const char *fw_data, ...@@ -234,9 +234,9 @@ sh_css_load_firmware(const char *fw_data,
sh_css_num_binaries = file_header->binary_nr; sh_css_num_binaries = file_header->binary_nr;
/* Only allocate memory for ISP blob info */ /* Only allocate memory for ISP blob info */
if (sh_css_num_binaries > (NUM_OF_SPS + NUM_OF_BLS)) { if (sh_css_num_binaries > NUM_OF_SPS) {
sh_css_blob_info = kmalloc( sh_css_blob_info = kmalloc(
(sh_css_num_binaries - (NUM_OF_SPS + NUM_OF_BLS)) * (sh_css_num_binaries - NUM_OF_SPS) *
sizeof(*sh_css_blob_info), GFP_KERNEL); sizeof(*sh_css_blob_info), GFP_KERNEL);
if (sh_css_blob_info == NULL) if (sh_css_blob_info == NULL)
return IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY; return IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY;
...@@ -272,15 +272,15 @@ sh_css_load_firmware(const char *fw_data, ...@@ -272,15 +272,15 @@ sh_css_load_firmware(const char *fw_data,
if (err != IA_CSS_SUCCESS) if (err != IA_CSS_SUCCESS)
return err; return err;
} else { } else {
/* All subsequent binaries (including bootloaders) (i>NUM_OF_SPS+NUM_OF_BLS) are ISP firmware */ /* All subsequent binaries (including bootloaders) (i>NUM_OF_SPS) are ISP firmware */
if (i < (NUM_OF_SPS + NUM_OF_BLS)) if (i < NUM_OF_SPS)
return IA_CSS_ERR_INTERNAL_ERROR; return IA_CSS_ERR_INTERNAL_ERROR;
if (bi->type != ia_css_isp_firmware) if (bi->type != ia_css_isp_firmware)
return IA_CSS_ERR_INTERNAL_ERROR; return IA_CSS_ERR_INTERNAL_ERROR;
if (sh_css_blob_info == NULL) /* cannot happen but KW does not see this */ if (sh_css_blob_info == NULL) /* cannot happen but KW does not see this */
return IA_CSS_ERR_INTERNAL_ERROR; return IA_CSS_ERR_INTERNAL_ERROR;
sh_css_blob_info[i-(NUM_OF_SPS + NUM_OF_BLS)] = bd; sh_css_blob_info[i - NUM_OF_SPS] = bd;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment