net: ipa: combine source and destination group limits

Replace IPA_RESOURCE_GROUP_SRC_MAX and IPA_RESOURCE_GROUP_DST_MAX
with a single symbol, IPA_RESOURCE_GROUP_MAX.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ipa/ipa_data.h b/drivers/net/ipa/ipa_data.h
index e1096d8..d6d1481 100644 (file)
--- a/drivers/net/ipa/ipa_data.h
+++ b/drivers/net/ipa/ipa_data.h
@@ -47,8 +47,7 @@
  */
 
 /* The maximum value returned by ipa_resource_group_{src,dst}_count() */
-#define IPA_RESOURCE_GROUP_SRC_MAX     5
-#define IPA_RESOURCE_GROUP_DST_MAX     5
+#define IPA_RESOURCE_GROUP_MAX 5
 
 /** enum ipa_qsb_master_id - array index for IPA QSB configuration data */
 enum ipa_qsb_master_id {
@@ -206,18 +205,18 @@ struct ipa_resource_limits {
 
 /**
  * struct ipa_resource_src - source endpoint group resource usage
- * @limits:    array of limits to use for each resource group
+ * @limits:    array of source resource limits, indexed by group
  */
 struct ipa_resource_src {
-       struct ipa_resource_limits limits[IPA_RESOURCE_GROUP_SRC_MAX];
+       struct ipa_resource_limits limits[IPA_RESOURCE_GROUP_MAX];
 };
 
 /**
  * struct ipa_resource_dst - destination endpoint group resource usage
- * @limits:    array of limits to use for each resource group
+ * @limits:    array of destination resource limits, indexed by group
  */
 struct ipa_resource_dst {
-       struct ipa_resource_limits limits[IPA_RESOURCE_GROUP_DST_MAX];
+       struct ipa_resource_limits limits[IPA_RESOURCE_GROUP_MAX];
 };
 
 /**

diff --git a/drivers/net/ipa/ipa_resource.c b/drivers/net/ipa/ipa_resource.c
index 506bccc..38b95b6 100644 (file)
--- a/drivers/net/ipa/ipa_resource.c
+++ b/drivers/net/ipa/ipa_resource.c
@@ -77,10 +77,10 @@ static bool ipa_resource_limits_valid(struct ipa *ipa,
        u32 j;
 
        /* We program at most 6 source or destination resource group limits */
-       BUILD_BUG_ON(IPA_RESOURCE_GROUP_SRC_MAX > 6);
+       BUILD_BUG_ON(IPA_RESOURCE_GROUP_MAX > 6);
 
        group_count = ipa_resource_group_src_count(ipa->version);
-       if (!group_count || group_count > IPA_RESOURCE_GROUP_SRC_MAX)
+       if (!group_count || group_count > IPA_RESOURCE_GROUP_MAX)
                return false;
 
        /* Return an error if a non-zero resource limit is specified
@@ -90,20 +90,20 @@ static bool ipa_resource_limits_valid(struct ipa *ipa,
                const struct ipa_resource_src *resource;
 
                resource = &data->resource_src[i];
-               for (j = group_count; j < IPA_RESOURCE_GROUP_SRC_MAX; j++)
+               for (j = group_count; j < IPA_RESOURCE_GROUP_MAX; j++)
                        if (resource->limits[j].min || resource->limits[j].max)
                                return false;
        }
 
        group_count = ipa_resource_group_dst_count(ipa->version);
-       if (!group_count || group_count > IPA_RESOURCE_GROUP_DST_MAX)
+       if (!group_count || group_count > IPA_RESOURCE_GROUP_MAX)
                return false;
 
        for (i = 0; i < data->resource_dst_count; i++) {
                const struct ipa_resource_dst *resource;
 
                resource = &data->resource_dst[i];
-               for (j = group_count; j < IPA_RESOURCE_GROUP_DST_MAX; j++)
+               for (j = group_count; j < IPA_RESOURCE_GROUP_MAX; j++)
                        if (resource->limits[j].min || resource->limits[j].max)
                                return false;
        }