Merge branch 'sfc-misc-cleanups' (cac7663c) · Commits · 戴 / test

drivers/net/ethernet/sfc/ef100_nic.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -1200,10 +1200,6 @@ static int ef100_probe_main(struct efx_nic *efx)
		if (rc)
		goto fail;

		rc = efx_init_channels(efx);
		if (rc)
		goto fail;

		down_write(&efx->filter_sem);
		rc = ef100_filter_table_probe(efx);
		up_write(&efx->filter_sem);

+0 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ int ef100_tx_probe(struct efx_tx_queue *tx_queue)
		(tx_queue->ptr_mask + 2) *
		sizeof(efx_oword_t),
		GFP_KERNEL);
		return 0;
		}

		void ef100_tx_init(struct efx_tx_queue *tx_queue)

+2 −3

Original line number	Diff line number	Diff line
		@@ -505,8 +505,7 @@ static void efx_filter_rfs_expire(struct work_struct *data)
		#endif

		/* Allocate and initialise a channel structure. */
		struct efx_channel *
		efx_alloc_channel(struct efx_nic efx, int i, struct efx_channel old_channel)
		static struct efx_channel efx_alloc_channel(struct efx_nic efx, int i)
		{
		struct efx_rx_queue *rx_queue;
		struct efx_tx_queue *tx_queue;
		@@ -545,7 +544,7 @@ int efx_init_channels(struct efx_nic *efx)
		unsigned int i;

		for (i = 0; i < EFX_MAX_CHANNELS; i++) {
		efx->channel[i] = efx_alloc_channel(efx, i, NULL);
		efx->channel[i] = efx_alloc_channel(efx, i);
		if (!efx->channel[i])
		return -ENOMEM;
		efx->msi_context[i].efx = efx;

+0 −2

Original line number	Diff line number	Diff line
		@@ -31,8 +31,6 @@ void efx_stop_eventq(struct efx_channel *channel);
		void efx_fini_eventq(struct efx_channel *channel);
		void efx_remove_eventq(struct efx_channel *channel);

		struct efx_channel *
		efx_alloc_channel(struct efx_nic efx, int i, struct efx_channel old_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);