drivers/net: fix build warning in ethernet/sfc/tx.c

Paul Gortmaker · davem330 · commit 440b87eac4ca · 2014-02-06T21:28:05.000-08:00
Commit ee45fd9 ("sfc: Use TX PIO for sufficiently small packets") introduced the following warning: drivers/net/ethernet/sfc/tx.c: In function 'efx_enqueue_skb': drivers/net/ethernet/sfc/tx.c:432:1: warning: label 'finish_packet' defined but not used Stick the label inside the same #ifdef that the code which calls it uses. Note that this is only seen for arch that do not set ARCH_HAS_IOREMAP_WC, such as arm, mips, sparc, ..., as the others enable the write combining code and hence use the label. Cc: Jon Cooper <jcooper@solarflare.com> Cc: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Acked-by: Shradha Shah <sshah@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/ethernet/sfc/tx.c b/drivers/net/ethernet/sfc/tx.c
@@ -429,7 +429,9 @@ netdev_tx_t efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb)
 	}
 
 	/* Transfer ownership of the skb to the final buffer */
+#ifdef EFX_USE_PIO
 finish_packet:
+#endif
 	buffer->skb = skb;
 	buffer->flags = EFX_TX_BUF_SKB | dma_flags;
 

Original file line number	Diff line number	Diff line change
`@@ -429,7 +429,9 @@ netdev_tx_t efx_enqueue_skb(struct efx_tx_queue tx_queue, struct sk_buff skb)`
`429`	`429`	`}`
`430`	`430`
`431`	`431`	`/* Transfer ownership of the skb to the final buffer */`
	`432`	`+#ifdef EFX_USE_PIO`
`432`	`433`	`finish_packet:`
	`434`	`+#endif`
`433`	`435`	`buffer->skb = skb;`
`434`	`436`	`buffer->flags = EFX_TX_BUF_SKB \| dma_flags;`
`435`	`437`