hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sfc: efx_default_channel_type APIs can be static

Browse Source 
This means we can remove them from efx_channel.h and avoid
naming conflicts later.
efx_channel_dummy_op_void() cannot be static as it is
used in ef100_nic.c.

Signed-off-by: Martin Habets <habetsm.xilinx@gmail.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Martin Habets 2022-04-11 12:27:10 +01:00 committed by Paolo Abeni
parent 80ecb114f2
commit 54fccfdd7c
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
drivers/net/ethernet/sfc/efx_channels.c
View File

@ -51,28 +51,7 @@ MODULE_PARM_DESC(irq_adapt_high_thresh,
*/ */
static int napi_weight = 64; static int napi_weight = 64;
/*************** static const struct efx_channel_type efx_default_channel_type;
* Housekeeping
***************/
int efx_channel_dummy_op_int(struct efx_channel *channel)
{
return 0;
}
void efx_channel_dummy_op_void(struct efx_channel *channel)
{
}
static const struct efx_channel_type efx_default_channel_type = {
.pre_probe = efx_channel_dummy_op_int,
.post_remove = efx_channel_dummy_op_void,
.get_name = efx_get_channel_name,
.copy = efx_copy_channel,
.want_txqs = efx_default_channel_want_txqs,
.keep_eventq = false,
.want_pio = true,
};
/************* /*************
* INTERRUPTS * INTERRUPTS
@ -619,6 +598,7 @@ void efx_fini_channels(struct efx_nic *efx)
/* Allocate and initialise a channel structure, copying parameters /* Allocate and initialise a channel structure, copying parameters
* (but not resources) from an old channel structure. * (but not resources) from an old channel structure.
*/ */
static
struct efx_channel *efx_copy_channel(const struct efx_channel *old_channel) struct efx_channel *efx_copy_channel(const struct efx_channel *old_channel)
{ {
struct efx_rx_queue *rx_queue; struct efx_rx_queue *rx_queue;
@ -696,7 +676,8 @@ fail:
return rc; return rc;
} }
void efx_get_channel_name(struct efx_channel *channel, char *buf, size_t len) static void efx_get_channel_name(struct efx_channel *channel, char *buf,
size_t len)
{ {
struct efx_nic *efx = channel->efx; struct efx_nic *efx = channel->efx;
const char *type; const char *type;
@ -1004,7 +985,7 @@ int efx_set_channels(struct efx_nic *efx)
return netif_set_real_num_rx_queues(efx->net_dev, efx->n_rx_channels); return netif_set_real_num_rx_queues(efx->net_dev, efx->n_rx_channels);
} }
bool efx_default_channel_want_txqs(struct efx_channel *channel) static bool efx_default_channel_want_txqs(struct efx_channel *channel)
{ {
return channel->channel - channel->efx->tx_channel_offset < return channel->channel - channel->efx->tx_channel_offset <
channel->efx->n_tx_channels; channel->efx->n_tx_channels;
@ -1362,3 +1343,26 @@ void efx_fini_napi(struct efx_nic *efx)
efx_for_each_channel(channel, efx) efx_for_each_channel(channel, efx)
efx_fini_napi_channel(channel); efx_fini_napi_channel(channel);
} }
/***************
* Housekeeping
***************/
static int efx_channel_dummy_op_int(struct efx_channel *channel)
{
return 0;
}
void efx_channel_dummy_op_void(struct efx_channel *channel)
{
}
static const struct efx_channel_type efx_default_channel_type = {
.pre_probe = efx_channel_dummy_op_int,
.post_remove = efx_channel_dummy_op_void,
.get_name = efx_get_channel_name,
.copy = efx_copy_channel,
.want_txqs = efx_default_channel_want_txqs,
.keep_eventq = false,
.want_pio = true,
};

4
drivers/net/ethernet/sfc/efx_channels.h
View File

@ -32,16 +32,13 @@ void efx_fini_eventq(struct efx_channel *channel);
void efx_remove_eventq(struct efx_channel *channel); void efx_remove_eventq(struct efx_channel *channel);
int efx_realloc_channels(struct efx_nic *efx, u32 rxq_entries, u32 txq_entries); int efx_realloc_channels(struct efx_nic *efx, u32 rxq_entries, u32 txq_entries);
void efx_get_channel_name(struct efx_channel *channel, char *buf, size_t len);
void efx_set_channel_names(struct efx_nic *efx); void efx_set_channel_names(struct efx_nic *efx);
int efx_init_channels(struct efx_nic *efx); int efx_init_channels(struct efx_nic *efx);
int efx_probe_channels(struct efx_nic *efx); int efx_probe_channels(struct efx_nic *efx);
int efx_set_channels(struct efx_nic *efx); int efx_set_channels(struct efx_nic *efx);
bool efx_default_channel_want_txqs(struct efx_channel *channel);
void efx_remove_channel(struct efx_channel *channel); void efx_remove_channel(struct efx_channel *channel);
void efx_remove_channels(struct efx_nic *efx); void efx_remove_channels(struct efx_nic *efx);
void efx_fini_channels(struct efx_nic *efx); void efx_fini_channels(struct efx_nic *efx);
struct efx_channel *efx_copy_channel(const struct efx_channel *old_channel);
void efx_start_channels(struct efx_nic *efx); void efx_start_channels(struct efx_nic *efx);
void efx_stop_channels(struct efx_nic *efx); void efx_stop_channels(struct efx_nic *efx);
@ -50,7 +47,6 @@ void efx_init_napi(struct efx_nic *efx);
void efx_fini_napi_channel(struct efx_channel *channel); void efx_fini_napi_channel(struct efx_channel *channel);
void efx_fini_napi(struct efx_nic *efx); void efx_fini_napi(struct efx_nic *efx);
int efx_channel_dummy_op_int(struct efx_channel *channel);
void efx_channel_dummy_op_void(struct efx_channel *channel); void efx_channel_dummy_op_void(struct efx_channel *channel);
#endif #endif