245 lines
8.8 KiB
Diff
245 lines
8.8 KiB
Diff
From: Sameeh Jubran <sameehj@amazon.com>
|
|
Date: Tue, 11 Jun 2019 14:58:10 +0300
|
|
Subject: [PATCH] net: ena: remove inline keyword from functions in *.c
|
|
Origin: https://git.kernel.org/linus/c2b542044761965db0e4cc400ab6abf670fc25b7
|
|
Bug-Debian: https://bugs.debian.org/941291
|
|
|
|
Let the compiler decide if the function should be inline in *.c files
|
|
|
|
Signed-off-by: Sameeh Jubran <sameehj@amazon.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/amazon/ena/ena_com.c | 6 ++---
|
|
drivers/net/ethernet/amazon/ena/ena_eth_com.c | 26 +++++++++----------
|
|
drivers/net/ethernet/amazon/ena/ena_netdev.c | 16 ++++++------
|
|
3 files changed, 24 insertions(+), 24 deletions(-)
|
|
|
|
Index: linux/drivers/net/ethernet/amazon/ena/ena_com.c
|
|
===================================================================
|
|
--- linux.orig/drivers/net/ethernet/amazon/ena/ena_com.c
|
|
+++ linux/drivers/net/ethernet/amazon/ena/ena_com.c
|
|
@@ -91,7 +91,7 @@ struct ena_com_stats_ctx {
|
|
struct ena_admin_acq_get_stats_resp get_resp;
|
|
};
|
|
|
|
-static inline int ena_com_mem_addr_set(struct ena_com_dev *ena_dev,
|
|
+static int ena_com_mem_addr_set(struct ena_com_dev *ena_dev,
|
|
struct ena_common_mem_addr *ena_addr,
|
|
dma_addr_t addr)
|
|
{
|
|
@@ -190,7 +190,7 @@ static int ena_com_admin_init_aenq(struc
|
|
return 0;
|
|
}
|
|
|
|
-static inline void comp_ctxt_release(struct ena_com_admin_queue *queue,
|
|
+static void comp_ctxt_release(struct ena_com_admin_queue *queue,
|
|
struct ena_comp_ctx *comp_ctx)
|
|
{
|
|
comp_ctx->occupied = false;
|
|
@@ -277,7 +277,7 @@ static struct ena_comp_ctx *__ena_com_su
|
|
return comp_ctx;
|
|
}
|
|
|
|
-static inline int ena_com_init_comp_ctxt(struct ena_com_admin_queue *queue)
|
|
+static int ena_com_init_comp_ctxt(struct ena_com_admin_queue *queue)
|
|
{
|
|
size_t size = queue->q_depth * sizeof(struct ena_comp_ctx);
|
|
struct ena_comp_ctx *comp_ctx;
|
|
Index: linux/drivers/net/ethernet/amazon/ena/ena_eth_com.c
|
|
===================================================================
|
|
--- linux.orig/drivers/net/ethernet/amazon/ena/ena_eth_com.c
|
|
+++ linux/drivers/net/ethernet/amazon/ena/ena_eth_com.c
|
|
@@ -32,7 +32,7 @@
|
|
|
|
#include "ena_eth_com.h"
|
|
|
|
-static inline struct ena_eth_io_rx_cdesc_base *ena_com_get_next_rx_cdesc(
|
|
+static struct ena_eth_io_rx_cdesc_base *ena_com_get_next_rx_cdesc(
|
|
struct ena_com_io_cq *io_cq)
|
|
{
|
|
struct ena_eth_io_rx_cdesc_base *cdesc;
|
|
@@ -59,7 +59,7 @@ static inline struct ena_eth_io_rx_cdesc
|
|
return cdesc;
|
|
}
|
|
|
|
-static inline void *get_sq_desc_regular_queue(struct ena_com_io_sq *io_sq)
|
|
+static void *get_sq_desc_regular_queue(struct ena_com_io_sq *io_sq)
|
|
{
|
|
u16 tail_masked;
|
|
u32 offset;
|
|
@@ -71,7 +71,7 @@ static inline void *get_sq_desc_regular_
|
|
return (void *)((uintptr_t)io_sq->desc_addr.virt_addr + offset);
|
|
}
|
|
|
|
-static inline int ena_com_write_bounce_buffer_to_dev(struct ena_com_io_sq *io_sq,
|
|
+static int ena_com_write_bounce_buffer_to_dev(struct ena_com_io_sq *io_sq,
|
|
u8 *bounce_buffer)
|
|
{
|
|
struct ena_com_llq_info *llq_info = &io_sq->llq_info;
|
|
@@ -111,7 +111,7 @@ static inline int ena_com_write_bounce_b
|
|
return 0;
|
|
}
|
|
|
|
-static inline int ena_com_write_header_to_bounce(struct ena_com_io_sq *io_sq,
|
|
+static int ena_com_write_header_to_bounce(struct ena_com_io_sq *io_sq,
|
|
u8 *header_src,
|
|
u16 header_len)
|
|
{
|
|
@@ -142,7 +142,7 @@ static inline int ena_com_write_header_t
|
|
return 0;
|
|
}
|
|
|
|
-static inline void *get_sq_desc_llq(struct ena_com_io_sq *io_sq)
|
|
+static void *get_sq_desc_llq(struct ena_com_io_sq *io_sq)
|
|
{
|
|
struct ena_com_llq_pkt_ctrl *pkt_ctrl = &io_sq->llq_buf_ctrl;
|
|
u8 *bounce_buffer;
|
|
@@ -162,7 +162,7 @@ static inline void *get_sq_desc_llq(stru
|
|
return sq_desc;
|
|
}
|
|
|
|
-static inline int ena_com_close_bounce_buffer(struct ena_com_io_sq *io_sq)
|
|
+static int ena_com_close_bounce_buffer(struct ena_com_io_sq *io_sq)
|
|
{
|
|
struct ena_com_llq_pkt_ctrl *pkt_ctrl = &io_sq->llq_buf_ctrl;
|
|
struct ena_com_llq_info *llq_info = &io_sq->llq_info;
|
|
@@ -189,7 +189,7 @@ static inline int ena_com_close_bounce_b
|
|
return 0;
|
|
}
|
|
|
|
-static inline void *get_sq_desc(struct ena_com_io_sq *io_sq)
|
|
+static void *get_sq_desc(struct ena_com_io_sq *io_sq)
|
|
{
|
|
if (io_sq->mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV)
|
|
return get_sq_desc_llq(io_sq);
|
|
@@ -197,7 +197,7 @@ static inline void *get_sq_desc(struct e
|
|
return get_sq_desc_regular_queue(io_sq);
|
|
}
|
|
|
|
-static inline int ena_com_sq_update_llq_tail(struct ena_com_io_sq *io_sq)
|
|
+static int ena_com_sq_update_llq_tail(struct ena_com_io_sq *io_sq)
|
|
{
|
|
struct ena_com_llq_pkt_ctrl *pkt_ctrl = &io_sq->llq_buf_ctrl;
|
|
struct ena_com_llq_info *llq_info = &io_sq->llq_info;
|
|
@@ -225,7 +225,7 @@ static inline int ena_com_sq_update_llq_
|
|
return 0;
|
|
}
|
|
|
|
-static inline int ena_com_sq_update_tail(struct ena_com_io_sq *io_sq)
|
|
+static int ena_com_sq_update_tail(struct ena_com_io_sq *io_sq)
|
|
{
|
|
if (io_sq->mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV)
|
|
return ena_com_sq_update_llq_tail(io_sq);
|
|
@@ -239,7 +239,7 @@ static inline int ena_com_sq_update_tail
|
|
return 0;
|
|
}
|
|
|
|
-static inline struct ena_eth_io_rx_cdesc_base *
|
|
+static struct ena_eth_io_rx_cdesc_base *
|
|
ena_com_rx_cdesc_idx_to_ptr(struct ena_com_io_cq *io_cq, u16 idx)
|
|
{
|
|
idx &= (io_cq->q_depth - 1);
|
|
@@ -248,7 +248,7 @@ static inline struct ena_eth_io_rx_cdesc
|
|
idx * io_cq->cdesc_entry_size_in_bytes);
|
|
}
|
|
|
|
-static inline u16 ena_com_cdesc_rx_pkt_get(struct ena_com_io_cq *io_cq,
|
|
+static u16 ena_com_cdesc_rx_pkt_get(struct ena_com_io_cq *io_cq,
|
|
u16 *first_cdesc_idx)
|
|
{
|
|
struct ena_eth_io_rx_cdesc_base *cdesc;
|
|
@@ -285,7 +285,7 @@ static inline u16 ena_com_cdesc_rx_pkt_g
|
|
return count;
|
|
}
|
|
|
|
-static inline int ena_com_create_and_store_tx_meta_desc(struct ena_com_io_sq *io_sq,
|
|
+static int ena_com_create_and_store_tx_meta_desc(struct ena_com_io_sq *io_sq,
|
|
struct ena_com_tx_ctx *ena_tx_ctx)
|
|
{
|
|
struct ena_eth_io_tx_meta_desc *meta_desc = NULL;
|
|
@@ -334,7 +334,7 @@ static inline int ena_com_create_and_sto
|
|
return ena_com_sq_update_tail(io_sq);
|
|
}
|
|
|
|
-static inline void ena_com_rx_set_flags(struct ena_com_rx_ctx *ena_rx_ctx,
|
|
+static void ena_com_rx_set_flags(struct ena_com_rx_ctx *ena_rx_ctx,
|
|
struct ena_eth_io_rx_cdesc_base *cdesc)
|
|
{
|
|
ena_rx_ctx->l3_proto = cdesc->status &
|
|
Index: linux/drivers/net/ethernet/amazon/ena/ena_netdev.c
|
|
===================================================================
|
|
--- linux.orig/drivers/net/ethernet/amazon/ena/ena_netdev.c
|
|
+++ linux/drivers/net/ethernet/amazon/ena/ena_netdev.c
|
|
@@ -326,7 +326,7 @@ static void ena_free_all_io_tx_resources
|
|
ena_free_tx_resources(adapter, i);
|
|
}
|
|
|
|
-static inline int validate_rx_req_id(struct ena_ring *rx_ring, u16 req_id)
|
|
+static int validate_rx_req_id(struct ena_ring *rx_ring, u16 req_id)
|
|
{
|
|
if (likely(req_id < rx_ring->ring_size))
|
|
return 0;
|
|
@@ -460,7 +460,7 @@ static void ena_free_all_io_rx_resources
|
|
ena_free_rx_resources(adapter, i);
|
|
}
|
|
|
|
-static inline int ena_alloc_rx_page(struct ena_ring *rx_ring,
|
|
+static int ena_alloc_rx_page(struct ena_ring *rx_ring,
|
|
struct ena_rx_buffer *rx_info, gfp_t gfp)
|
|
{
|
|
struct ena_com_buf *ena_buf;
|
|
@@ -620,7 +620,7 @@ static void ena_free_all_rx_bufs(struct
|
|
ena_free_rx_bufs(adapter, i);
|
|
}
|
|
|
|
-static inline void ena_unmap_tx_skb(struct ena_ring *tx_ring,
|
|
+static void ena_unmap_tx_skb(struct ena_ring *tx_ring,
|
|
struct ena_tx_buffer *tx_info)
|
|
{
|
|
struct ena_com_buf *ena_buf;
|
|
@@ -956,7 +956,7 @@ static struct sk_buff *ena_rx_skb(struct
|
|
* @ena_rx_ctx: received packet context/metadata
|
|
* @skb: skb currently being received and modified
|
|
*/
|
|
-static inline void ena_rx_checksum(struct ena_ring *rx_ring,
|
|
+static void ena_rx_checksum(struct ena_ring *rx_ring,
|
|
struct ena_com_rx_ctx *ena_rx_ctx,
|
|
struct sk_buff *skb)
|
|
{
|
|
@@ -1156,7 +1156,7 @@ error:
|
|
return 0;
|
|
}
|
|
|
|
-inline void ena_adjust_intr_moderation(struct ena_ring *rx_ring,
|
|
+void ena_adjust_intr_moderation(struct ena_ring *rx_ring,
|
|
struct ena_ring *tx_ring)
|
|
{
|
|
/* We apply adaptive moderation on Rx path only.
|
|
@@ -1175,7 +1175,7 @@ inline void ena_adjust_intr_moderation(s
|
|
rx_ring->per_napi_bytes = 0;
|
|
}
|
|
|
|
-static inline void ena_unmask_interrupt(struct ena_ring *tx_ring,
|
|
+static void ena_unmask_interrupt(struct ena_ring *tx_ring,
|
|
struct ena_ring *rx_ring)
|
|
{
|
|
struct ena_eth_io_intr_reg intr_reg;
|
|
@@ -1195,7 +1195,7 @@ static inline void ena_unmask_interrupt(
|
|
ena_com_unmask_intr(rx_ring->ena_com_io_cq, &intr_reg);
|
|
}
|
|
|
|
-static inline void ena_update_ring_numa_node(struct ena_ring *tx_ring,
|
|
+static void ena_update_ring_numa_node(struct ena_ring *tx_ring,
|
|
struct ena_ring *rx_ring)
|
|
{
|
|
int cpu = get_cpu();
|
|
@@ -3331,7 +3331,7 @@ static void ena_release_bars(struct ena_
|
|
pci_release_selected_regions(pdev, release_bars);
|
|
}
|
|
|
|
-static inline void set_default_llq_configurations(struct ena_llq_configurations *llq_config)
|
|
+static void set_default_llq_configurations(struct ena_llq_configurations *llq_config)
|
|
{
|
|
llq_config->llq_header_location = ENA_ADMIN_INLINE_HEADER;
|
|
llq_config->llq_ring_entry_size = ENA_ADMIN_LIST_ENTRY_SIZE_128B;
|