net: ipa: move the definition of gsi_ee_id

Move the definition of the gsi_ee_id enumerated type out of "gsi.h"
and into "ipa_version.h".  That latter header file isolates the
definition of the ipa_version enumerated type, allowing it to be
included in both IPA and GSI code.  We have the same requirement for
gsi_ee_id, and moving it here makes it easier to get only that
definition without everything else defined in "gsi.h".

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ipa/gsi.h b/drivers/net/ipa/gsi.h
index 84d178a1a7d225f0b54d206cad97f460a94872c8..0fc25a6ae006caf716530b066bb2a1e5792a7d9d 100644 (file)
--- a/drivers/net/ipa/gsi.h
+++ b/drivers/net/ipa/gsi.h
@@ -31,14 +31,6 @@ struct gsi_trans;
 struct gsi_channel_data;
 struct ipa_gsi_endpoint_data;
 
-/* Execution environment IDs */
-enum gsi_ee_id {
-       GSI_EE_AP                               = 0x0,
-       GSI_EE_MODEM                            = 0x1,
-       GSI_EE_UC                               = 0x2,
-       GSI_EE_TZ                               = 0x3,
-};
-
 struct gsi_ring {
        void *virt;                     /* ring array base address */
        dma_addr_t addr;                /* primarily low 32 bits used */

diff --git a/drivers/net/ipa/ipa_version.h b/drivers/net/ipa/ipa_version.h
index 6c16c895d84296733730857cdea39564939e31a4..852d6cbc87758345b3154607bdca7cdd5ce4f2a0 100644 (file)
--- a/drivers/net/ipa/ipa_version.h
+++ b/drivers/net/ipa/ipa_version.h
@@ -38,4 +38,12 @@ enum ipa_version {
        IPA_VERSION_4_11,
 };
 
+/* Execution environment IDs */
+enum gsi_ee_id {
+       GSI_EE_AP               = 0x0,
+       GSI_EE_MODEM            = 0x1,
+       GSI_EE_UC               = 0x2,
+       GSI_EE_TZ               = 0x3,
+};
+
 #endif /* _IPA_VERSION_H_ */