tzc: remove deprecated types
Types tzc_action_t and tzc_region_attributes_t are deprecated.
Change-Id: Ieefeb8521a0e1130f39d09b5c0d2728f05084773
Signed-off-by: Ambroise Vincent <ambroise.vincent@arm.com>
diff --git a/drivers/arm/tzc/tzc380.c b/drivers/arm/tzc/tzc380.c
index 676df8d..9518748 100644
--- a/drivers/arm/tzc/tzc380.c
+++ b/drivers/arm/tzc/tzc380.c
@@ -24,7 +24,7 @@
return mmio_read_32(base + TZC380_CONFIGURATION_OFF);
}
-static void tzc380_write_action(uintptr_t base, tzc_action_t action)
+static void tzc380_write_action(uintptr_t base, unsigned int action)
{
mmio_write_32(base + ACTION_OFF, action);
}
@@ -91,7 +91,7 @@
tzc380_write_region_attributes(tzc380.base, region, attr);
}
-void tzc380_set_action(tzc_action_t action)
+void tzc380_set_action(unsigned int action)
{
assert(tzc380.base != 0U);
diff --git a/include/drivers/arm/tzc380.h b/include/drivers/arm/tzc380.h
index 03b9b05..a8098a2 100644
--- a/include/drivers/arm/tzc380.h
+++ b/include/drivers/arm/tzc380.h
@@ -138,7 +138,7 @@
void tzc380_configure_region(uint8_t region,
uintptr_t region_base,
unsigned int attr);
-void tzc380_set_action(tzc_action_t action);
+void tzc380_set_action(unsigned int action);
static inline void tzc_init(uintptr_t base)
{
tzc380_init(base);
@@ -151,7 +151,7 @@
tzc380_configure_region(region, region_base, attr);
}
-static inline void tzc_set_action(tzc_action_t action)
+static inline void tzc_set_action(unsigned int action)
{
tzc380_set_action(action);
}
diff --git a/include/drivers/arm/tzc_common.h b/include/drivers/arm/tzc_common.h
index 4820baa..e58201c 100644
--- a/include/drivers/arm/tzc_common.h
+++ b/include/drivers/arm/tzc_common.h
@@ -86,12 +86,4 @@
#define TZC_REGION_OFFSET(region_size, region_no) \
((region_size) * (region_no))
-#ifndef __ASSEMBLY__
-
-#if !ERROR_DEPRECATED
-typedef unsigned int tzc_action_t;
-typedef unsigned int tzc_region_attributes_t;
-#endif
-
-#endif /* __ASSEMBLY__ */
#endif /* TZC_COMMON_H */