net: ipa: don't define empty memory regions

The AP_HEADER memory region for both the SDM845 and SC7180 SoCs has
zero size, and has no canaries.  Defining an offset for such a
zero-length region is not meaningful, so it's better not to define
it at all.  The size of this region is used in the code, but its
value will still be zero because the memory regions are defined in
statically initialized memory.

For the SC7180, the STATS_DROP memory region has a zero size and no
canaries as well.

These regions are the only place where a zero-sized region is
defined despite having no canaries.  Remove them.

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-sc7180.c b/drivers/net/ipa/ipa_data-sc7180.c
index 434869508a215ceec31c68f1a73007b43819a4b7..0bdb60f6755c45e823d7d51050724e9cca8ae171 100644 (file)
--- a/drivers/net/ipa/ipa_data-sc7180.c
+++ b/drivers/net/ipa/ipa_data-sc7180.c
@@ -253,11 +253,6 @@ static const struct ipa_mem ipa_mem_local_data[] = {
                .size           = 0x0140,
                .canary_count   = 2,
        },
-       [IPA_MEM_AP_HEADER] = {
-               .offset         = 0x05e8,
-               .size           = 0x0000,
-               .canary_count   = 0,
-       },
        [IPA_MEM_MODEM_PROC_CTX] = {
                .offset         = 0x05f0,
                .size           = 0x0200,
@@ -283,11 +278,6 @@ static const struct ipa_mem ipa_mem_local_data[] = {
                .size           = 0x0140,
                .canary_count   = 0,
        },
-       [IPA_MEM_STATS_DROP] = {
-               .offset         = 0x0bf0,
-               .size           = 0,
-               .canary_count   = 0,
-       },
        [IPA_MEM_MODEM] = {
                .offset         = 0x0bf0,
                .size           = 0x140c,

diff --git a/drivers/net/ipa/ipa_data-sdm845.c b/drivers/net/ipa/ipa_data-sdm845.c
index 401861e3c0aa476917480cd2dab49164ae7a6596..8cae9325eb08e8a5cb02be030fc15c0be53d81df 100644 (file)
--- a/drivers/net/ipa/ipa_data-sdm845.c
+++ b/drivers/net/ipa/ipa_data-sdm845.c
@@ -293,11 +293,6 @@ static const struct ipa_mem ipa_mem_local_data[] = {
                .size           = 0x0140,
                .canary_count   = 2,
        },
-       [IPA_MEM_AP_HEADER] = {
-               .offset         = 0x07c8,
-               .size           = 0x0000,
-               .canary_count   = 0,
-       },
        [IPA_MEM_MODEM_PROC_CTX] = {
                .offset         = 0x07d0,
                .size           = 0x0200,