Don't need to declare those functions with extern: drivers/staging/media/atomisp/pci/css_2401_system/host/isys_irq_private.h:51:35: warning: function 'isys_irqc_state_dump' with external linkage has definition drivers/staging/media/atomisp/pci/css_2401_system/host/isys_irq_private.h:68:35: warning: function 'isys_irqc_reg_store' with external linkage has definition drivers/staging/media/atomisp/pci/css_2401_system/host/isys_irq_private.h:85:39: warning: function 'isys_irqc_reg_load' with external linkage has definition drivers/staging/media/atomisp/pci/css_2401_system/host/isys_irq.c:31:35: warning: function 'isys_irqc_status_enable' with external linkage has definition Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx> --- .../pci/css_2401_system/host/isys_irq.c | 3 +-- .../css_2401_system/host/isys_irq_private.h | 8 +++--- .../host/isys_irq_public.h | 25 ++++++++----------- .../pci/hive_isp_css_include/isys_irq.h | 12 --------- 4 files changed, 15 insertions(+), 33 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/css_2401_system/host/isys_irq.c b/drivers/staging/media/atomisp/pci/css_2401_system/host/isys_irq.c index 99576af4713c..b6135c4b6eea 100644 --- a/drivers/staging/media/atomisp/pci/css_2401_system/host/isys_irq.c +++ b/drivers/staging/media/atomisp/pci/css_2401_system/host/isys_irq.c @@ -28,8 +28,7 @@ #endif /* Public interface */ -STORAGE_CLASS_ISYS2401_IRQ_C void isys_irqc_status_enable( - const isys_irq_ID_t isys_irqc_id) +void isys_irqc_status_enable(const isys_irq_ID_t isys_irqc_id) { assert(isys_irqc_id < N_ISYS_IRQ_ID); diff --git a/drivers/staging/media/atomisp/pci/css_2401_system/host/isys_irq_private.h b/drivers/staging/media/atomisp/pci/css_2401_system/host/isys_irq_private.h index 1e96f0267ac0..fb168c25bdfc 100644 --- a/drivers/staging/media/atomisp/pci/css_2401_system/host/isys_irq_private.h +++ b/drivers/staging/media/atomisp/pci/css_2401_system/host/isys_irq_private.h @@ -29,7 +29,7 @@ * @brief Get the isys irq status. * Refer to "isys_irq.h" for details. */ -STORAGE_CLASS_ISYS2401_IRQ_C void isys_irqc_state_get( +void isys_irqc_state_get( const isys_irq_ID_t isys_irqc_id, isys_irqc_state_t *state) { @@ -48,7 +48,7 @@ STORAGE_CLASS_ISYS2401_IRQ_C void isys_irqc_state_get( * @brief Dump the isys irq status. * Refer to "isys_irq.h" for details. */ -STORAGE_CLASS_ISYS2401_IRQ_C void isys_irqc_state_dump( +void isys_irqc_state_dump( const isys_irq_ID_t isys_irqc_id, const isys_irqc_state_t *state) { @@ -65,7 +65,7 @@ STORAGE_CLASS_ISYS2401_IRQ_C void isys_irqc_state_dump( + -------------------------------------------------------*/ /* Support functions */ -STORAGE_CLASS_ISYS2401_IRQ_C void isys_irqc_reg_store( +void isys_irqc_reg_store( const isys_irq_ID_t isys_irqc_id, const unsigned int reg_idx, const hrt_data value) @@ -82,7 +82,7 @@ STORAGE_CLASS_ISYS2401_IRQ_C void isys_irqc_reg_store( ia_css_device_store_uint32(reg_addr, value); } -STORAGE_CLASS_ISYS2401_IRQ_C hrt_data isys_irqc_reg_load( +hrt_data isys_irqc_reg_load( const isys_irq_ID_t isys_irqc_id, const unsigned int reg_idx) { diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/isys_irq_public.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/isys_irq_public.h index cd738f4b65a0..736cbc4e3705 100644 --- a/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/isys_irq_public.h +++ b/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/isys_irq_public.h @@ -21,25 +21,20 @@ #if defined(ISP2401) -STORAGE_CLASS_ISYS2401_IRQ_H void isys_irqc_state_get( - const isys_irq_ID_t isys_irqc_id, - isys_irqc_state_t *state); +void isys_irqc_state_get(const isys_irq_ID_t isys_irqc_id, + isys_irqc_state_t *state); -STORAGE_CLASS_ISYS2401_IRQ_H void isys_irqc_state_dump( - const isys_irq_ID_t isys_irqc_id, - const isys_irqc_state_t *state); +void isys_irqc_state_dump(const isys_irq_ID_t isys_irqc_id, + const isys_irqc_state_t *state); -STORAGE_CLASS_ISYS2401_IRQ_H void isys_irqc_reg_store( - const isys_irq_ID_t isys_irqc_id, - const unsigned int reg_idx, - const hrt_data value); +void isys_irqc_reg_store(const isys_irq_ID_t isys_irqc_id, + const unsigned int reg_idx, + const hrt_data value); -STORAGE_CLASS_ISYS2401_IRQ_H hrt_data isys_irqc_reg_load( - const isys_irq_ID_t isys_irqc_id, - const unsigned int reg_idx); +hrt_data isys_irqc_reg_load(const isys_irq_ID_t isys_irqc_id, + const unsigned int reg_idx); -STORAGE_CLASS_ISYS2401_IRQ_H void isys_irqc_status_enable( - const isys_irq_ID_t isys_irqc_id); +void isys_irqc_status_enable(const isys_irq_ID_t isys_irqc_id); #endif /* defined(ISP2401) */ diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_include/isys_irq.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/isys_irq.h index 06bc9e1450ec..001c55ea970b 100644 --- a/drivers/staging/media/atomisp/pci/hive_isp_css_include/isys_irq.h +++ b/drivers/staging/media/atomisp/pci/hive_isp_css_include/isys_irq.h @@ -21,20 +21,8 @@ #if defined(ISP2401) -#ifndef __INLINE_ISYS2401_IRQ__ - -#define STORAGE_CLASS_ISYS2401_IRQ_H extern -#define STORAGE_CLASS_ISYS2401_IRQ_C extern #include "isys_irq_public.h" -#else /* __INLINE_ISYS2401_IRQ__ */ - -#define STORAGE_CLASS_ISYS2401_IRQ_H static inline -#define STORAGE_CLASS_ISYS2401_IRQ_C static inline -#include "isys_irq_private.h" - -#endif /* __INLINE_ISYS2401_IRQ__ */ - #endif /* defined(ISP2401) */ #endif /* __IA_CSS_ISYS_IRQ_H__ */ -- 2.26.2