[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: Alan Cox <alan@linux.intel.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c
index 57b4fe5e603fa87976ec807965b9779f758f197f..a179de5212d9cbe67019e949630373d5c0e34fc9 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c
@@ -234,9 +234,9 @@ sh_css_load_firmware(const char *fw_data,
 
        sh_css_num_binaries = file_header->binary_nr;
        /* 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_num_binaries - (NUM_OF_SPS + NUM_OF_BLS)) *
+                                       (sh_css_num_binaries - NUM_OF_SPS) *
                                        sizeof(*sh_css_blob_info), GFP_KERNEL);
                if (sh_css_blob_info == NULL)
                        return IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY;
@@ -272,15 +272,15 @@ sh_css_load_firmware(const char *fw_data,
                        if (err != IA_CSS_SUCCESS)
                                return err;
                } else {
-                       /* All subsequent binaries (including bootloaders) (i>NUM_OF_SPS+NUM_OF_BLS) are ISP firmware */
-                       if (i < (NUM_OF_SPS + NUM_OF_BLS))
+                       /* All subsequent binaries (including bootloaders) (i>NUM_OF_SPS) are ISP firmware */
+                       if (i < NUM_OF_SPS)
                                return IA_CSS_ERR_INTERNAL_ERROR;
 
                        if (bi->type != ia_css_isp_firmware)
                                return IA_CSS_ERR_INTERNAL_ERROR;
                        if (sh_css_blob_info == NULL) /* cannot happen but KW does not see this */
                                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;
                }
        }