net: ipa: rename the NAT enumerated type

Rename the ipa_nat_en enumerated type to be ipa_nat_type, and rename
its symbols accordingly.  Add a comment indicating those values are
also used in the IPA status nat_type field.

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

diff --git a/drivers/net/ipa/ipa_endpoint.c b/drivers/net/ipa/ipa_endpoint.c
index 5cf3ac2b5c85ad65682a2e0e05958d5576513121..178934f131be5dac53582622aeecccfdd8568b10 100644 (file)
--- a/drivers/net/ipa/ipa_endpoint.c
+++ b/drivers/net/ipa/ipa_endpoint.c
@@ -68,6 +68,8 @@ enum ipa_status_mask {
        IPA_STATUS_MASK_BYTE_LIMIT              = BIT(15),
 };
 
+/** The IPA status nat_type field uses enum ipa_nat_type hardware values */
+
 /* Status element provided by hardware */
 struct ipa_status {
        u8 opcode;              /* enum ipa_status_opcode */
@@ -570,7 +572,7 @@ static void ipa_endpoint_init_nat(struct ipa_endpoint *endpoint)
                return;
 
        reg = ipa_reg(ipa, ENDP_INIT_NAT);
-       val = ipa_reg_encode(reg, NAT_EN, IPA_NAT_BYPASS);
+       val = ipa_reg_encode(reg, NAT_EN, IPA_NAT_TYPE_BYPASS);
 
        iowrite32(val, ipa->reg_virt + ipa_reg_n_offset(reg, endpoint_id));
 }

diff --git a/drivers/net/ipa/ipa_reg.h b/drivers/net/ipa/ipa_reg.h
index ff64b19a4df8b11538855447f68b3263fd2bd0ab..b1a3c2c7e1674d26be4466e2d985518a0c57c71d 100644 (file)
--- a/drivers/net/ipa/ipa_reg.h
+++ b/drivers/net/ipa/ipa_reg.h
@@ -382,11 +382,11 @@ enum ipa_reg_endp_init_nat_field_id {
        NAT_EN,
 };
 
-/** enum ipa_nat_en - ENDP_INIT_NAT register NAT_EN field value */
-enum ipa_nat_en {
-       IPA_NAT_BYPASS                          = 0x0,
-       IPA_NAT_SRC                             = 0x1,
-       IPA_NAT_DST                             = 0x2,
+/** enum ipa_nat_type - ENDP_INIT_NAT register NAT_EN field value */
+enum ipa_nat_type {
+       IPA_NAT_TYPE_BYPASS                     = 0,
+       IPA_NAT_TYPE_SRC                        = 1,
+       IPA_NAT_TYPE_DST                        = 2,
 };
 
 /* ENDP_INIT_HDR register */