From a2a25ca20358d9d69a75fdc8529a90783d087905 Mon Sep 17 00:00:00 2001 From: dan huh Date: Wed, 28 Nov 2018 19:58:29 +0900 Subject: [PATCH] [RAMEN9610-9418][9610] fimc-is2: Add __nocfi at happen to cfi error function PR JIRA ID: CPR-462 Change-Id: I71dff7c73114f58a8120aca2de1848f757c09e9f Signed-off-by: dan huh --- .../fimc-is-v6_10_0/fimc-is-hw-chain.c | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/media/platform/exynos/fimc-is2/ischain/fimc-is-v6_10_0/fimc-is-hw-chain.c b/drivers/media/platform/exynos/fimc-is2/ischain/fimc-is-v6_10_0/fimc-is-hw-chain.c index a4b5759d1dd8..9eb61c1c4419 100644 --- a/drivers/media/platform/exynos/fimc-is2/ischain/fimc-is-v6_10_0/fimc-is-hw-chain.c +++ b/drivers/media/platform/exynos/fimc-is2/ischain/fimc-is-v6_10_0/fimc-is-hw-chain.c @@ -524,7 +524,7 @@ void fimc_is_hw_csi_qchannel_enable_all(bool enable) } #endif -static inline void fimc_is_isr1_ddk(void *data) +static inline void __nocfi fimc_is_isr1_ddk(void *data) { struct fimc_is_interface_hwip *itf_hw = NULL; struct hwip_intr_handler *intr_hw = NULL; @@ -541,7 +541,7 @@ static inline void fimc_is_isr1_ddk(void *data) } } -static inline void fimc_is_isr2_ddk(void *data) +static inline void __nocfi fimc_is_isr2_ddk(void *data) { struct fimc_is_interface_hwip *itf_hw = NULL; struct hwip_intr_handler *intr_hw = NULL; @@ -573,49 +573,49 @@ static inline void fimc_is_isr1_host(void *data) } -static irqreturn_t fimc_is_isr1_3aa0(int irq, void *data) +static irqreturn_t __nocfi fimc_is_isr1_3aa0(int irq, void *data) { fimc_is_isr1_ddk(data); return IRQ_HANDLED; } -static irqreturn_t fimc_is_isr2_3aa0(int irq, void *data) +static irqreturn_t __nocfi fimc_is_isr2_3aa0(int irq, void *data) { fimc_is_isr2_ddk(data); return IRQ_HANDLED; } -static irqreturn_t fimc_is_isr1_3aa1(int irq, void *data) +static irqreturn_t __nocfi fimc_is_isr1_3aa1(int irq, void *data) { fimc_is_isr1_ddk(data); return IRQ_HANDLED; } -static irqreturn_t fimc_is_isr2_3aa1(int irq, void *data) +static irqreturn_t __nocfi fimc_is_isr2_3aa1(int irq, void *data) { fimc_is_isr2_ddk(data); return IRQ_HANDLED; } -static irqreturn_t fimc_is_isr1_isp(int irq, void *data) +static irqreturn_t __nocfi fimc_is_isr1_isp(int irq, void *data) { fimc_is_isr1_ddk(data); return IRQ_HANDLED; } -static irqreturn_t fimc_is_isr2_isp(int irq, void *data) +static irqreturn_t __nocfi fimc_is_isr2_isp(int irq, void *data) { fimc_is_isr2_ddk(data); return IRQ_HANDLED; } -static irqreturn_t fimc_is_isr1_mcs(int irq, void *data) +static irqreturn_t __nocfi fimc_is_isr1_mcs(int irq, void *data) { fimc_is_isr1_host(data); return IRQ_HANDLED; } -static irqreturn_t fimc_is_isr1_vra(int irq, void *data) +static irqreturn_t __nocfi fimc_is_isr1_vra(int irq, void *data) { struct fimc_is_interface_hwip *itf_hw = NULL; struct hwip_intr_handler *intr_hw = NULL; @@ -1089,7 +1089,7 @@ int fimc_is_hw_get_irq(void *itfc_data, void *pdev_data, int hw_id) } //#define DECLARE_FUNC_NAME(NUM, NAME) fimc_is_isr##NUM_##NAME -static inline int __fimc_is_hw_request_irq(struct fimc_is_interface_hwip *itf_hwip, +static inline int __nocfi __fimc_is_hw_request_irq(struct fimc_is_interface_hwip *itf_hwip, const char *name, int isr_num, unsigned int added_irq_flags, -- 2.20.1