From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Date: Mon, 15 Nov 2021 16:05:51 +0000 (+0000)
Subject: media: atomisp: drop an useless #ifdef ISP2401
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7bedd01849d64e2b9c4b873342b5a3d0e45812eb;p=linux.git

media: atomisp: drop an useless #ifdef ISP2401

The Yocto Aero driver for ISP2401 sets my_css_save.loaded_fw.
As we're using the same firmware, remove the ifdef there.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---

diff --git a/drivers/staging/media/atomisp/pci/sh_css.c b/drivers/staging/media/atomisp/pci/sh_css.c
index 3aa4f8bc39c4d..51dbd4e495d0a 100644
--- a/drivers/staging/media/atomisp/pci/sh_css.c
+++ b/drivers/staging/media/atomisp/pci/sh_css.c
@@ -1742,9 +1742,8 @@ ia_css_init(struct device *dev, const struct ia_css_env *env,
 			return err;
 		}
 		fw_explicitly_loaded = false;
-#ifndef ISP2401
+
 		my_css_save.loaded_fw = (struct ia_css_fw *)fw;
-#endif
 	}
 	if (!sh_css_setup_spctrl_config(&sh_css_sp_fw, SP_PROG_NAME, &spctrl_cfg))
 		return -EINVAL;