aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Vick <matthew.vick@intel.com>2015-01-26 22:39:25 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2015-02-05 22:41:51 -0500
commitf4a80f1ef7ba70f24d28f78706965f9871ac1d9f (patch)
treebe204626a348e3a7addd9eab18078d4ab4a6b33c
parent33a44c2873ba64c54d11a9364b6b43271761d245 (diff)
fm10k: Resolve compile warnings with W=1
Fix two cases where variables are being set but not used. Signed-off-by: Matthew Vick <matthew.vick@intel.com> Tested-by: Krishneil Singh<Krishneil.k.singh@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/fm10k/fm10k_mbx.c5
-rw-r--r--drivers/net/ethernet/intel/fm10k/fm10k_ptp.c3
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_mbx.c b/drivers/net/ethernet/intel/fm10k/fm10k_mbx.c
index 14a4ea795c01..9f5457c9e627 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_mbx.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_mbx.c
@@ -1194,12 +1194,11 @@ static s32 fm10k_mbx_process_disconnect(struct fm10k_hw *hw,
1194{ 1194{
1195 const enum fm10k_mbx_state state = mbx->state; 1195 const enum fm10k_mbx_state state = mbx->state;
1196 const u32 *hdr = &mbx->mbx_hdr; 1196 const u32 *hdr = &mbx->mbx_hdr;
1197 u16 head, tail; 1197 u16 head;
1198 s32 err; 1198 s32 err;
1199 1199
1200 /* we will need to pull all of the fields for verification */ 1200 /* we will need to pull the header field for verification */
1201 head = FM10K_MSG_HDR_FIELD_GET(*hdr, HEAD); 1201 head = FM10K_MSG_HDR_FIELD_GET(*hdr, HEAD);
1202 tail = FM10K_MSG_HDR_FIELD_GET(*hdr, TAIL);
1203 1202
1204 /* We should not be receiving disconnect if Rx is incomplete */ 1203 /* We should not be receiving disconnect if Rx is incomplete */
1205 if (mbx->pushed) 1204 if (mbx->pushed)
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ptp.c b/drivers/net/ethernet/intel/fm10k/fm10k_ptp.c
index 7822809436a3..d966044e017a 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_ptp.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_ptp.c
@@ -57,7 +57,6 @@ void fm10k_ts_tx_enqueue(struct fm10k_intfc *interface, struct sk_buff *skb)
57 struct sk_buff_head *list = &interface->ts_tx_skb_queue; 57 struct sk_buff_head *list = &interface->ts_tx_skb_queue;
58 struct sk_buff *clone; 58 struct sk_buff *clone;
59 unsigned long flags; 59 unsigned long flags;
60 __le16 dglort;
61 60
62 /* create clone for us to return on the Tx path */ 61 /* create clone for us to return on the Tx path */
63 clone = skb_clone_sk(skb); 62 clone = skb_clone_sk(skb);
@@ -65,8 +64,6 @@ void fm10k_ts_tx_enqueue(struct fm10k_intfc *interface, struct sk_buff *skb)
65 return; 64 return;
66 65
67 FM10K_CB(clone)->ts_tx_timeout = jiffies + FM10K_TS_TX_TIMEOUT; 66 FM10K_CB(clone)->ts_tx_timeout = jiffies + FM10K_TS_TX_TIMEOUT;
68 dglort = FM10K_CB(clone)->fi.w.dglort;
69
70 spin_lock_irqsave(&list->lock, flags); 67 spin_lock_irqsave(&list->lock, flags);
71 68
72 /* attempt to locate any buffers with the same dglort, 69 /* attempt to locate any buffers with the same dglort,