Skip to content

Commit

Permalink
net: ipa: pass mem ID to ipa_mem_zero_region_add()
Browse files Browse the repository at this point in the history
Pass a memory region ID rather than the address of a memory region
descriptor to ipa_mem_zero_region_add() to simplify callers.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Alex Elder authored and David S. Miller committed Jun 10, 2021
1 parent 07c525a commit ce928bf
Showing 1 changed file with 8 additions and 11 deletions.
19 changes: 8 additions & 11 deletions drivers/net/ipa/ipa_mem.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@

/* Add an immediate command to a transaction that zeroes a memory region */
static void
ipa_mem_zero_region_add(struct gsi_trans *trans, const struct ipa_mem *mem)
ipa_mem_zero_region_add(struct gsi_trans *trans, enum ipa_mem_id mem_id)
{
struct ipa *ipa = container_of(trans->gsi, struct ipa, gsi);
const struct ipa_mem *mem = &ipa->mem[mem_id];
dma_addr_t addr = ipa->zero_addr;

if (!mem->size)
Expand Down Expand Up @@ -83,11 +84,9 @@ int ipa_mem_setup(struct ipa *ipa)

ipa_cmd_hdr_init_local_add(trans, offset, size, addr);

ipa_mem_zero_region_add(trans, &ipa->mem[IPA_MEM_MODEM_PROC_CTX]);

ipa_mem_zero_region_add(trans, &ipa->mem[IPA_MEM_AP_PROC_CTX]);

ipa_mem_zero_region_add(trans, &ipa->mem[IPA_MEM_MODEM]);
ipa_mem_zero_region_add(trans, IPA_MEM_MODEM_PROC_CTX);
ipa_mem_zero_region_add(trans, IPA_MEM_AP_PROC_CTX);
ipa_mem_zero_region_add(trans, IPA_MEM_MODEM);

gsi_trans_commit_wait(trans);

Expand Down Expand Up @@ -411,11 +410,9 @@ int ipa_mem_zero_modem(struct ipa *ipa)
return -EBUSY;
}

ipa_mem_zero_region_add(trans, &ipa->mem[IPA_MEM_MODEM_HEADER]);

ipa_mem_zero_region_add(trans, &ipa->mem[IPA_MEM_MODEM_PROC_CTX]);

ipa_mem_zero_region_add(trans, &ipa->mem[IPA_MEM_MODEM]);
ipa_mem_zero_region_add(trans, IPA_MEM_MODEM_HEADER);
ipa_mem_zero_region_add(trans, IPA_MEM_MODEM_PROC_CTX);
ipa_mem_zero_region_add(trans, IPA_MEM_MODEM);

gsi_trans_commit_wait(trans);

Expand Down

0 comments on commit ce928bf

Please sign in to comment.