diff options
| author | Soren Brinkmann <soren.brinkmann@xilinx.com> | 2016-01-14 10:02:33 -0800 |
|---|---|---|
| committer | Soren Brinkmann <soren.brinkmann@xilinx.com> | 2016-01-14 10:55:17 -0800 |
| commit | 70ecb564fd9f9acee231631757ce17c19c66d610 (patch) | |
| tree | eaa7267947162c8afcbd9d67836323ae63d551d4 /include/drivers | |
| parent | 70050dd10c7fd547fdfa82b9342570de34f1d841 (diff) | |
Migrate __warn_deprecated -> __deprecated
Use the new __deprecated macro from the generic cdefs header and remove
the deprecated __warn_deprecated.
Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Diffstat (limited to 'include/drivers')
| -rw-r--r-- | include/drivers/arm/arm_gic.h | 23 | ||||
| -rw-r--r-- | include/drivers/arm/cci400.h | 7 |
2 files changed, 14 insertions, 16 deletions
diff --git a/include/drivers/arm/arm_gic.h b/include/drivers/arm/arm_gic.h index 8c1f03fb..37ff5c9a 100644 --- a/include/drivers/arm/arm_gic.h +++ b/include/drivers/arm/arm_gic.h @@ -31,7 +31,6 @@ #ifndef __ARM_GIC_H__ #define __ARM_GIC_H__ -#include <common_def.h> #include <stdint.h> /******************************************************************************* @@ -41,18 +40,18 @@ void arm_gic_init(uintptr_t gicc_base, uintptr_t gicd_base, uintptr_t gicr_base, const unsigned int *irq_sec_ptr, - unsigned int num_irqs) __warn_deprecated; -void arm_gic_setup(void) __warn_deprecated; -void arm_gic_cpuif_deactivate(void) __warn_deprecated; -void arm_gic_cpuif_setup(void) __warn_deprecated; -void arm_gic_pcpu_distif_setup(void) __warn_deprecated; + unsigned int num_irqs) __deprecated; +void arm_gic_setup(void) __deprecated; +void arm_gic_cpuif_deactivate(void) __deprecated; +void arm_gic_cpuif_setup(void) __deprecated; +void arm_gic_pcpu_distif_setup(void) __deprecated; uint32_t arm_gic_interrupt_type_to_line(uint32_t type, - uint32_t security_state) __warn_deprecated; -uint32_t arm_gic_get_pending_interrupt_type(void) __warn_deprecated; -uint32_t arm_gic_get_pending_interrupt_id(void) __warn_deprecated; -uint32_t arm_gic_acknowledge_interrupt(void) __warn_deprecated; -void arm_gic_end_of_interrupt(uint32_t id) __warn_deprecated; -uint32_t arm_gic_get_interrupt_type(uint32_t id) __warn_deprecated; + uint32_t security_state) __deprecated; +uint32_t arm_gic_get_pending_interrupt_type(void) __deprecated; +uint32_t arm_gic_get_pending_interrupt_id(void) __deprecated; +uint32_t arm_gic_acknowledge_interrupt(void) __deprecated; +void arm_gic_end_of_interrupt(uint32_t id) __deprecated; +uint32_t arm_gic_get_interrupt_type(uint32_t id) __deprecated; #endif /* __GIC_H__ */ diff --git a/include/drivers/arm/cci400.h b/include/drivers/arm/cci400.h index a5dc9a03..bfadc8f8 100644 --- a/include/drivers/arm/cci400.h +++ b/include/drivers/arm/cci400.h @@ -76,7 +76,6 @@ #ifndef __ASSEMBLY__ -#include <common_def.h> #include <stdint.h> /* Function declarations */ @@ -92,10 +91,10 @@ */ void cci_init(uintptr_t cci_base, int slave_iface3_cluster_ix, - int slave_iface4_cluster_ix) __warn_deprecated; + int slave_iface4_cluster_ix) __deprecated; -void cci_enable_cluster_coherency(unsigned long mpidr) __warn_deprecated; -void cci_disable_cluster_coherency(unsigned long mpidr) __warn_deprecated; +void cci_enable_cluster_coherency(unsigned long mpidr) __deprecated; +void cci_disable_cluster_coherency(unsigned long mpidr) __deprecated; #endif /* __ASSEMBLY__ */ #endif /* __CCI_400_H__ */ |