diff options
| author | Alan Cox <alan@linux.intel.com> | 2017-03-08 11:39:48 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-08 13:39:09 +0100 |
| commit | f6a681e0164725a5699bd403cb0f0d3497a86a48 (patch) | |
| tree | 322deac3f1f72eea9884f20db71e927ee0661595 /drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c | |
| parent | e35d4427b44217f8a1188e6301ea61bfafb37b4e (diff) | |
| download | op-kernel-dev-f6a681e0164725a5699bd403cb0f0d3497a86a48.zip op-kernel-dev-f6a681e0164725a5699bd403cb0f0d3497a86a48.tar.gz | |
atomisp: HRT_CSIM is never defined
Remove the content that is guarded by this define
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c')
| -rw-r--r-- | drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c | 11 |
1 files changed, 2 insertions, 9 deletions
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 b7db3de..eba96cc 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c @@ -226,7 +226,7 @@ sh_css_load_firmware(const char *fw_data, strncpy(FW_rel_ver_name, file_header->version, min(sizeof(FW_rel_ver_name), sizeof(file_header->version)) - 1); valid_firmware = sh_css_check_firmware_version(fw_data); if (!valid_firmware) { -#if (!defined HRT_CSIM && !defined HRT_RTL) +#if !defined(HRT_RTL) IA_CSS_ERROR("CSS code version (%s) and firmware version (%s) mismatch!", file_header->version, release_version); return IA_CSS_ERR_VERSION_MISMATCH; @@ -350,14 +350,7 @@ sh_css_load_blob(const unsigned char *blob, unsigned size) is required for the CSS DMA to read the instructions. */ assert(blob != NULL); - if (target_addr) { + if (target_addr) mmgr_store(target_addr, blob, size); -#ifdef HRT_CSIM - { - unsigned padded_size = CEIL_MUL(size, HIVE_ISP_DDR_WORD_BYTES); - mmgr_clear(target_addr + size, padded_size - size); - } -#endif - } return target_addr; } |
