net: ipa: kill two constant symbols

The entries in each IPA routing table are divided between the modem
and the AP.  The modem always gets some number of entries located at
the base of the table; the AP gets all those that follow.

There's no reason to think the modem will use anything different
from the first entries in a routing table, so:
  - Get rid of IPA_ROUTE_MODEM_MIN (just assume it's 0)
  - Get rid of IPA_ROUTE_AP_MIN (just assume it's IPA_ROUTE_MODEM_COUNT)
And finally:
  - Open-code IPA_ROUTE_AP_COUNT and remove its definition

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ipa/ipa_table.c b/drivers/net/ipa/ipa_table.c
index 510ff2dc8999a8a6dc724a483ff35b2755525f32..74d7082b3c5aaf2618fea6c5f8c9528920baf075 100644 (file)
--- a/drivers/net/ipa/ipa_table.c
+++ b/drivers/net/ipa/ipa_table.c
@@ -106,12 +106,6 @@
  *                 ----------------------
  */
 
-/* Assignment of route table entries to the modem and AP */
-#define IPA_ROUTE_MODEM_MIN            0
-#define IPA_ROUTE_AP_MIN               IPA_ROUTE_MODEM_COUNT
-#define IPA_ROUTE_AP_COUNT \
-               (IPA_ROUTE_COUNT_MAX - IPA_ROUTE_MODEM_COUNT)
-
 /* Filter or route rules consist of a set of 32-bit values followed by a
  * 32-bit all-zero rule list terminator.  The "zero rule" is simply an
  * all-zero rule followed by the list terminator.
@@ -342,11 +336,11 @@ static int ipa_route_reset(struct ipa *ipa, bool modem)
        }
 
        if (modem) {
-               first = IPA_ROUTE_MODEM_MIN;
+               first = 0;
                count = IPA_ROUTE_MODEM_COUNT;
        } else {
-               first = IPA_ROUTE_AP_MIN;
-               count = IPA_ROUTE_AP_COUNT;
+               first = IPA_ROUTE_MODEM_COUNT;
+               count = IPA_ROUTE_COUNT_MAX - IPA_ROUTE_MODEM_COUNT;
        }
 
        ipa_table_reset_add(trans, false, first, count, IPA_MEM_V4_ROUTE);
@@ -561,8 +555,7 @@ static void ipa_filter_config(struct ipa *ipa, bool modem)
 
 static bool ipa_route_id_modem(u32 route_id)
 {
-       return route_id >= IPA_ROUTE_MODEM_MIN &&
-               route_id <= IPA_ROUTE_MODEM_MIN + IPA_ROUTE_MODEM_COUNT - 1;
+       return route_id < IPA_ROUTE_MODEM_COUNT;
 }
 
 /**