Commit 54fccfdd authored by Martin Habets's avatar Martin Habets Committed by Paolo Abeni
Browse files

sfc: efx_default_channel_type APIs can be static 



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: default avatarMartin Habets <habetsm.xilinx@gmail.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 80ecb114

drivers/net/ethernet/sfc/efx_channels.c

+28 −24
Original line number Diff line number Diff line
@@ -51,28 +51,7 @@ MODULE_PARM_DESC(irq_adapt_high_thresh, 
 */

static int napi_weight = 64;



/***************

 * 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,

};

static const struct efx_channel_type efx_default_channel_type;



/*************

 * INTERRUPTS
@@ -619,6 +598,7 @@ void efx_fini_channels(struct efx_nic *efx) 
/* Allocate and initialise a channel structure, copying parameters

 * (but not resources) from an old channel structure.

 */

static

struct efx_channel *efx_copy_channel(const struct efx_channel *old_channel)

{

	struct efx_rx_queue *rx_queue;
@@ -696,7 +676,8 @@ static int efx_probe_channel(struct efx_channel *channel) 
	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;

	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);

}



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 <

		channel->efx->n_tx_channels;
@@ -1362,3 +1343,26 @@ void efx_fini_napi(struct efx_nic *efx) 
	efx_for_each_channel(channel, efx)

		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,

};

drivers/net/ethernet/sfc/efx_channels.h

+0 −4
Original line number Diff line number Diff line
@@ -32,16 +32,13 @@ void efx_fini_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);

void efx_get_channel_name(struct efx_channel *channel, char *buf, size_t len);

void efx_set_channel_names(struct efx_nic *efx);

int efx_init_channels(struct efx_nic *efx);

int efx_probe_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_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_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(struct efx_nic *efx);



int efx_channel_dummy_op_int(struct efx_channel *channel);

void efx_channel_dummy_op_void(struct efx_channel *channel);



#endif