Skip to content

Commit c2b5420

Browse files
Sameeh Jubrandavem330
Sameeh Jubran
authored and
davem330
committed
net: ena: remove inline keyword from functions in *.c
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>
1 parent eece4d2 commit c2b5420

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

‎drivers/net/ethernet/amazon/ena/ena_com.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ struct ena_com_stats_ctx {
9191
struct ena_admin_acq_get_stats_resp get_resp;
9292
};
9393

94-
static inline int ena_com_mem_addr_set(struct ena_com_dev *ena_dev,
94+
static int ena_com_mem_addr_set(struct ena_com_dev *ena_dev,
9595
struct ena_common_mem_addr *ena_addr,
9696
dma_addr_t addr)
9797
{
@@ -190,7 +190,7 @@ static int ena_com_admin_init_aenq(struct ena_com_dev *dev,
190190
return 0;
191191
}
192192

193-
static inline void comp_ctxt_release(struct ena_com_admin_queue *queue,
193+
static void comp_ctxt_release(struct ena_com_admin_queue *queue,
194194
struct ena_comp_ctx *comp_ctx)
195195
{
196196
comp_ctx->occupied = false;
@@ -277,7 +277,7 @@ static struct ena_comp_ctx *__ena_com_submit_admin_cmd(struct ena_com_admin_queu
277277
return comp_ctx;
278278
}
279279

280-
static inline int ena_com_init_comp_ctxt(struct ena_com_admin_queue *queue)
280+
static int ena_com_init_comp_ctxt(struct ena_com_admin_queue *queue)
281281
{
282282
size_t size = queue->q_depth * sizeof(struct ena_comp_ctx);
283283
struct ena_comp_ctx *comp_ctx;

‎drivers/net/ethernet/amazon/ena/ena_eth_com.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
#include "ena_eth_com.h"
3434

35-
static inline struct ena_eth_io_rx_cdesc_base *ena_com_get_next_rx_cdesc(
35+
static struct ena_eth_io_rx_cdesc_base *ena_com_get_next_rx_cdesc(
3636
struct ena_com_io_cq *io_cq)
3737
{
3838
struct ena_eth_io_rx_cdesc_base *cdesc;
@@ -59,7 +59,7 @@ static inline struct ena_eth_io_rx_cdesc_base *ena_com_get_next_rx_cdesc(
5959
return cdesc;
6060
}
6161

62-
static inline void *get_sq_desc_regular_queue(struct ena_com_io_sq *io_sq)
62+
static void *get_sq_desc_regular_queue(struct ena_com_io_sq *io_sq)
6363
{
6464
u16 tail_masked;
6565
u32 offset;
@@ -71,7 +71,7 @@ static inline void *get_sq_desc_regular_queue(struct ena_com_io_sq *io_sq)
7171
return (void *)((uintptr_t)io_sq->desc_addr.virt_addr + offset);
7272
}
7373

74-
static inline int ena_com_write_bounce_buffer_to_dev(struct ena_com_io_sq *io_sq,
74+
static int ena_com_write_bounce_buffer_to_dev(struct ena_com_io_sq *io_sq,
7575
u8 *bounce_buffer)
7676
{
7777
struct ena_com_llq_info *llq_info = &io_sq->llq_info;
@@ -111,7 +111,7 @@ static inline int ena_com_write_bounce_buffer_to_dev(struct ena_com_io_sq *io_sq
111111
return 0;
112112
}
113113

114-
static inline int ena_com_write_header_to_bounce(struct ena_com_io_sq *io_sq,
114+
static int ena_com_write_header_to_bounce(struct ena_com_io_sq *io_sq,
115115
u8 *header_src,
116116
u16 header_len)
117117
{
@@ -142,7 +142,7 @@ static inline int ena_com_write_header_to_bounce(struct ena_com_io_sq *io_sq,
142142
return 0;
143143
}
144144

145-
static inline void *get_sq_desc_llq(struct ena_com_io_sq *io_sq)
145+
static void *get_sq_desc_llq(struct ena_com_io_sq *io_sq)
146146
{
147147
struct ena_com_llq_pkt_ctrl *pkt_ctrl = &io_sq->llq_buf_ctrl;
148148
u8 *bounce_buffer;
@@ -162,7 +162,7 @@ static inline void *get_sq_desc_llq(struct ena_com_io_sq *io_sq)
162162
return sq_desc;
163163
}
164164

165-
static inline int ena_com_close_bounce_buffer(struct ena_com_io_sq *io_sq)
165+
static int ena_com_close_bounce_buffer(struct ena_com_io_sq *io_sq)
166166
{
167167
struct ena_com_llq_pkt_ctrl *pkt_ctrl = &io_sq->llq_buf_ctrl;
168168
struct ena_com_llq_info *llq_info = &io_sq->llq_info;
@@ -189,15 +189,15 @@ static inline int ena_com_close_bounce_buffer(struct ena_com_io_sq *io_sq)
189189
return 0;
190190
}
191191

192-
static inline void *get_sq_desc(struct ena_com_io_sq *io_sq)
192+
static void *get_sq_desc(struct ena_com_io_sq *io_sq)
193193
{
194194
if (io_sq->mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV)
195195
return get_sq_desc_llq(io_sq);
196196

197197
return get_sq_desc_regular_queue(io_sq);
198198
}
199199

200-
static inline int ena_com_sq_update_llq_tail(struct ena_com_io_sq *io_sq)
200+
static int ena_com_sq_update_llq_tail(struct ena_com_io_sq *io_sq)
201201
{
202202
struct ena_com_llq_pkt_ctrl *pkt_ctrl = &io_sq->llq_buf_ctrl;
203203
struct ena_com_llq_info *llq_info = &io_sq->llq_info;
@@ -225,7 +225,7 @@ static inline int ena_com_sq_update_llq_tail(struct ena_com_io_sq *io_sq)
225225
return 0;
226226
}
227227

228-
static inline int ena_com_sq_update_tail(struct ena_com_io_sq *io_sq)
228+
static int ena_com_sq_update_tail(struct ena_com_io_sq *io_sq)
229229
{
230230
if (io_sq->mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV)
231231
return ena_com_sq_update_llq_tail(io_sq);
@@ -239,7 +239,7 @@ static inline int ena_com_sq_update_tail(struct ena_com_io_sq *io_sq)
239239
return 0;
240240
}
241241

242-
static inline struct ena_eth_io_rx_cdesc_base *
242+
static struct ena_eth_io_rx_cdesc_base *
243243
ena_com_rx_cdesc_idx_to_ptr(struct ena_com_io_cq *io_cq, u16 idx)
244244
{
245245
idx &= (io_cq->q_depth - 1);
@@ -248,7 +248,7 @@ static inline struct ena_eth_io_rx_cdesc_base *
248248
idx * io_cq->cdesc_entry_size_in_bytes);
249249
}
250250

251-
static inline u16 ena_com_cdesc_rx_pkt_get(struct ena_com_io_cq *io_cq,
251+
static u16 ena_com_cdesc_rx_pkt_get(struct ena_com_io_cq *io_cq,
252252
u16 *first_cdesc_idx)
253253
{
254254
struct ena_eth_io_rx_cdesc_base *cdesc;
@@ -285,7 +285,7 @@ static inline u16 ena_com_cdesc_rx_pkt_get(struct ena_com_io_cq *io_cq,
285285
return count;
286286
}
287287

288-
static inline int ena_com_create_and_store_tx_meta_desc(struct ena_com_io_sq *io_sq,
288+
static int ena_com_create_and_store_tx_meta_desc(struct ena_com_io_sq *io_sq,
289289
struct ena_com_tx_ctx *ena_tx_ctx)
290290
{
291291
struct ena_eth_io_tx_meta_desc *meta_desc = NULL;
@@ -334,7 +334,7 @@ static inline int ena_com_create_and_store_tx_meta_desc(struct ena_com_io_sq *io
334334
return ena_com_sq_update_tail(io_sq);
335335
}
336336

337-
static inline void ena_com_rx_set_flags(struct ena_com_rx_ctx *ena_rx_ctx,
337+
static void ena_com_rx_set_flags(struct ena_com_rx_ctx *ena_rx_ctx,
338338
struct ena_eth_io_rx_cdesc_base *cdesc)
339339
{
340340
ena_rx_ctx->l3_proto = cdesc->status &

‎drivers/net/ethernet/amazon/ena/ena_netdev.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ static void ena_free_all_io_tx_resources(struct ena_adapter *adapter)
326326
ena_free_tx_resources(adapter, i);
327327
}
328328

329-
static inline int validate_rx_req_id(struct ena_ring *rx_ring, u16 req_id)
329+
static int validate_rx_req_id(struct ena_ring *rx_ring, u16 req_id)
330330
{
331331
if (likely(req_id < rx_ring->ring_size))
332332
return 0;
@@ -460,7 +460,7 @@ static void ena_free_all_io_rx_resources(struct ena_adapter *adapter)
460460
ena_free_rx_resources(adapter, i);
461461
}
462462

463-
static inline int ena_alloc_rx_page(struct ena_ring *rx_ring,
463+
static int ena_alloc_rx_page(struct ena_ring *rx_ring,
464464
struct ena_rx_buffer *rx_info, gfp_t gfp)
465465
{
466466
struct ena_com_buf *ena_buf;
@@ -620,7 +620,7 @@ static void ena_free_all_rx_bufs(struct ena_adapter *adapter)
620620
ena_free_rx_bufs(adapter, i);
621621
}
622622

623-
static inline void ena_unmap_tx_skb(struct ena_ring *tx_ring,
623+
static void ena_unmap_tx_skb(struct ena_ring *tx_ring,
624624
struct ena_tx_buffer *tx_info)
625625
{
626626
struct ena_com_buf *ena_buf;
@@ -955,7 +955,7 @@ static struct sk_buff *ena_rx_skb(struct ena_ring *rx_ring,
955955
* @ena_rx_ctx: received packet context/metadata
956956
* @skb: skb currently being received and modified
957957
*/
958-
static inline void ena_rx_checksum(struct ena_ring *rx_ring,
958+
static void ena_rx_checksum(struct ena_ring *rx_ring,
959959
struct ena_com_rx_ctx *ena_rx_ctx,
960960
struct sk_buff *skb)
961961
{
@@ -1155,7 +1155,7 @@ static int ena_clean_rx_irq(struct ena_ring *rx_ring, struct napi_struct *napi,
11551155
return 0;
11561156
}
11571157

1158-
inline void ena_adjust_intr_moderation(struct ena_ring *rx_ring,
1158+
void ena_adjust_intr_moderation(struct ena_ring *rx_ring,
11591159
struct ena_ring *tx_ring)
11601160
{
11611161
/* We apply adaptive moderation on Rx path only.
@@ -1174,7 +1174,7 @@ inline void ena_adjust_intr_moderation(struct ena_ring *rx_ring,
11741174
rx_ring->per_napi_bytes = 0;
11751175
}
11761176

1177-
static inline void ena_unmask_interrupt(struct ena_ring *tx_ring,
1177+
static void ena_unmask_interrupt(struct ena_ring *tx_ring,
11781178
struct ena_ring *rx_ring)
11791179
{
11801180
struct ena_eth_io_intr_reg intr_reg;
@@ -1194,7 +1194,7 @@ static inline void ena_unmask_interrupt(struct ena_ring *tx_ring,
11941194
ena_com_unmask_intr(rx_ring->ena_com_io_cq, &intr_reg);
11951195
}
11961196

1197-
static inline void ena_update_ring_numa_node(struct ena_ring *tx_ring,
1197+
static void ena_update_ring_numa_node(struct ena_ring *tx_ring,
11981198
struct ena_ring *rx_ring)
11991199
{
12001200
int cpu = get_cpu();
@@ -3337,7 +3337,7 @@ static void ena_release_bars(struct ena_com_dev *ena_dev, struct pci_dev *pdev)
33373337
pci_release_selected_regions(pdev, release_bars);
33383338
}
33393339

3340-
static inline void set_default_llq_configurations(struct ena_llq_configurations *llq_config)
3340+
static void set_default_llq_configurations(struct ena_llq_configurations *llq_config)
33413341
{
33423342
llq_config->llq_header_location = ENA_ADMIN_INLINE_HEADER;
33433343
llq_config->llq_ring_entry_size = ENA_ADMIN_LIST_ENTRY_SIZE_128B;

0 commit comments

Comments
 (0)