net: ipa: generalize register field functions

[tomoyo/tomoyo-test1.git] / drivers / net / ipa / ipa_mem.c

diff --git a/drivers/net/ipa/ipa_mem.c b/drivers/net/ipa/ipa_mem.c
index 20241fa..85096d1 100644 (file)
--- a/drivers/net/ipa/ipa_mem.c
+++ b/drivers/net/ipa/ipa_mem.c
@@ -115,7 +115,7 @@ int ipa_mem_setup(struct ipa *ipa)
        offset = ipa->mem_offset + mem->offset;
 
        reg = ipa_reg(ipa, LOCAL_PKT_PROC_CNTXT);
-       val = ipa_reg_encode(reg, IPA_BASE_ADDR, offset);
+       val = reg_encode(reg, IPA_BASE_ADDR, offset);
        iowrite32(val, ipa->reg_virt + reg_offset(reg));
 
        return 0;
@@ -331,10 +331,10 @@ int ipa_mem_config(struct ipa *ipa)
        val = ioread32(ipa->reg_virt + reg_offset(reg));
 
        /* The fields in the register are in 8 byte units */
-       ipa->mem_offset = 8 * ipa_reg_decode(reg, MEM_BADDR, val);
+       ipa->mem_offset = 8 * reg_decode(reg, MEM_BADDR, val);
 
        /* Make sure the end is within the region's mapped space */
-       mem_size = 8 * ipa_reg_decode(reg, MEM_SIZE, val);
+       mem_size = 8 * reg_decode(reg, MEM_SIZE, val);
 
        /* If the sizes don't match, issue a warning */
        if (ipa->mem_offset + mem_size < ipa->mem_size) {