net: ipa: remove command direction argument

We no longer use the direction argument for gsi_trans_cmd_add(), so
get rid of it in its definition, and in its seven callers.

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

diff --git a/drivers/net/ipa/gsi_trans.c b/drivers/net/ipa/gsi_trans.c
index cf8ee42373547813cd87a9df0819a96a880acc79..472792992f866e29741490d7ebcb88f51078eed4 100644 (file)
--- a/drivers/net/ipa/gsi_trans.c
+++ b/drivers/net/ipa/gsi_trans.c
@@ -410,8 +410,7 @@ void gsi_trans_free(struct gsi_trans *trans)
 
 /* Add an immediate command to a transaction */
 void gsi_trans_cmd_add(struct gsi_trans *trans, void *buf, u32 size,
-                      dma_addr_t addr, enum dma_data_direction direction,
-                      enum ipa_cmd_opcode opcode)
+                      dma_addr_t addr, enum ipa_cmd_opcode opcode)
 {
        u32 which = trans->used++;
        struct scatterlist *sg;

diff --git a/drivers/net/ipa/gsi_trans.h b/drivers/net/ipa/gsi_trans.h
index 387ea50dd039e1ff01407179c3346e5b188690f3..9a39909915ef5f6ec8bdd38ef569b09636983932 100644 (file)
--- a/drivers/net/ipa/gsi_trans.h
+++ b/drivers/net/ipa/gsi_trans.h
@@ -165,12 +165,10 @@ void gsi_trans_free(struct gsi_trans *trans);
  * @buf:       Buffer pointer for command payload
  * @size:      Number of bytes in buffer
  * @addr:      DMA address for payload
- * @direction: Direction of DMA transfer (or DMA_NONE if none required)
  * @opcode:    IPA immediate command opcode
  */
 void gsi_trans_cmd_add(struct gsi_trans *trans, void *buf, u32 size,
-                      dma_addr_t addr, enum dma_data_direction direction,
-                      enum ipa_cmd_opcode opcode);
+                      dma_addr_t addr, enum ipa_cmd_opcode opcode);
 
 /**
  * gsi_trans_page_add() - Add a page transfer to a transaction

diff --git a/drivers/net/ipa/ipa_cmd.c b/drivers/net/ipa/ipa_cmd.c
index 77b84cea6e68fe7e704d4b1b1eb691be64c414e2..5fd74d70070449419428df2af45b46775fc5b71b 100644 (file)
--- a/drivers/net/ipa/ipa_cmd.c
+++ b/drivers/net/ipa/ipa_cmd.c
@@ -402,7 +402,6 @@ void ipa_cmd_table_init_add(struct gsi_trans *trans,
                            dma_addr_t hash_addr)
 {
        struct ipa *ipa = container_of(trans->gsi, struct ipa, gsi);
-       enum dma_data_direction direction = DMA_TO_DEVICE;
        struct ipa_cmd_hw_ip_fltrt_init *payload;
        union ipa_cmd_payload *cmd_payload;
        dma_addr_t payload_addr;
@@ -433,7 +432,7 @@ void ipa_cmd_table_init_add(struct gsi_trans *trans,
        payload->nhash_rules_addr = cpu_to_le64(addr);
 
        gsi_trans_cmd_add(trans, payload, sizeof(*payload), payload_addr,
-                         direction, opcode);
+                         opcode);
 }
 
 /* Initialize header space in IPA-local memory */
@@ -442,7 +441,6 @@ void ipa_cmd_hdr_init_local_add(struct gsi_trans *trans, u32 offset, u16 size,
 {
        struct ipa *ipa = container_of(trans->gsi, struct ipa, gsi);
        enum ipa_cmd_opcode opcode = IPA_CMD_HDR_INIT_LOCAL;
-       enum dma_data_direction direction = DMA_TO_DEVICE;
        struct ipa_cmd_hw_hdr_init_local *payload;
        union ipa_cmd_payload *cmd_payload;
        dma_addr_t payload_addr;
@@ -464,7 +462,7 @@ void ipa_cmd_hdr_init_local_add(struct gsi_trans *trans, u32 offset, u16 size,
        payload->flags = cpu_to_le32(flags);
 
        gsi_trans_cmd_add(trans, payload, sizeof(*payload), payload_addr,
-                         direction, opcode);
+                         opcode);
 }
 
 void ipa_cmd_register_write_add(struct gsi_trans *trans, u32 offset, u32 value,
@@ -521,7 +519,7 @@ void ipa_cmd_register_write_add(struct gsi_trans *trans, u32 offset, u32 value,
        payload->clear_options = cpu_to_le32(options);
 
        gsi_trans_cmd_add(trans, payload, sizeof(*payload), payload_addr,
-                         DMA_NONE, opcode);
+                         opcode);
 }
 
 /* Skip IP packet processing on the next data transfer on a TX channel */
@@ -529,7 +527,6 @@ static void ipa_cmd_ip_packet_init_add(struct gsi_trans *trans, u8 endpoint_id)
 {
        struct ipa *ipa = container_of(trans->gsi, struct ipa, gsi);
        enum ipa_cmd_opcode opcode = IPA_CMD_IP_PACKET_INIT;
-       enum dma_data_direction direction = DMA_TO_DEVICE;
        struct ipa_cmd_ip_packet_init *payload;
        union ipa_cmd_payload *cmd_payload;
        dma_addr_t payload_addr;
@@ -541,7 +538,7 @@ static void ipa_cmd_ip_packet_init_add(struct gsi_trans *trans, u8 endpoint_id)
                                        IPA_PACKET_INIT_DEST_ENDPOINT_FMASK);
 
        gsi_trans_cmd_add(trans, payload, sizeof(*payload), payload_addr,
-                         direction, opcode);
+                         opcode);
 }
 
 /* Use a DMA command to read or write a block of IPA-resident memory */
@@ -552,7 +549,6 @@ void ipa_cmd_dma_shared_mem_add(struct gsi_trans *trans, u32 offset, u16 size,
        enum ipa_cmd_opcode opcode = IPA_CMD_DMA_SHARED_MEM;
        struct ipa_cmd_hw_dma_mem_mem *payload;
        union ipa_cmd_payload *cmd_payload;
-       enum dma_data_direction direction;
        dma_addr_t payload_addr;
        u16 flags;
 
@@ -583,17 +579,14 @@ void ipa_cmd_dma_shared_mem_add(struct gsi_trans *trans, u32 offset, u16 size,
        payload->flags = cpu_to_le16(flags);
        payload->system_addr = cpu_to_le64(addr);
 
-       direction = toward_ipa ? DMA_TO_DEVICE : DMA_FROM_DEVICE;
-
        gsi_trans_cmd_add(trans, payload, sizeof(*payload), payload_addr,
-                         direction, opcode);
+                         opcode);
 }
 
 static void ipa_cmd_ip_tag_status_add(struct gsi_trans *trans)
 {
        struct ipa *ipa = container_of(trans->gsi, struct ipa, gsi);
        enum ipa_cmd_opcode opcode = IPA_CMD_IP_PACKET_TAG_STATUS;
-       enum dma_data_direction direction = DMA_TO_DEVICE;
        struct ipa_cmd_ip_packet_tag_status *payload;
        union ipa_cmd_payload *cmd_payload;
        dma_addr_t payload_addr;
@@ -604,14 +597,13 @@ static void ipa_cmd_ip_tag_status_add(struct gsi_trans *trans)
        payload->tag = le64_encode_bits(0, IP_PACKET_TAG_STATUS_TAG_FMASK);
 
        gsi_trans_cmd_add(trans, payload, sizeof(*payload), payload_addr,
-                         direction, opcode);
+                         opcode);
 }
 
 /* Issue a small command TX data transfer */
 static void ipa_cmd_transfer_add(struct gsi_trans *trans)
 {
        struct ipa *ipa = container_of(trans->gsi, struct ipa, gsi);
-       enum dma_data_direction direction = DMA_TO_DEVICE;
        enum ipa_cmd_opcode opcode = IPA_CMD_NONE;
        union ipa_cmd_payload *payload;
        dma_addr_t payload_addr;
@@ -620,7 +612,7 @@ static void ipa_cmd_transfer_add(struct gsi_trans *trans)
        payload = ipa_cmd_payload_alloc(ipa, &payload_addr);
 
        gsi_trans_cmd_add(trans, payload, sizeof(*payload), payload_addr,
-                         direction, opcode);
+                         opcode);
 }
 
 /* Add immediate commands to a transaction to clear the hardware pipeline */