Browse Source

[vxge] Avoid unused variable warning in gcc 4.6

Reported-by: Ralph Giles <giles@thaumas.net>
Tested-by: Ralph Giles <giles@thaumas.net>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown 13 years ago
parent
commit
4e5d759938
2 changed files with 1 additions and 11 deletions
  1. 0
    6
      src/drivers/net/vxge/vxge_main.c
  2. 1
    5
      src/drivers/net/vxge/vxge_traffic.c

+ 0
- 6
src/drivers/net/vxge/vxge_main.c View File

@@ -182,13 +182,11 @@ vxge_xmit(struct net_device *dev, struct io_buffer *iobuf)
182 182
 	struct vxge_fifo *fifo = NULL;
183 183
 	struct vxgedev *vdev = NULL;
184 184
 	struct __vxge_hw_fifo *fifoh;
185
-	struct __vxge_hw_device  *hldev;
186 185
 	struct vxge_hw_fifo_txd *txdp;
187 186
 
188 187
 	vxge_trace();
189 188
 
190 189
 	vdev = (struct vxgedev *)netdev_priv(dev);
191
-	hldev = (struct __vxge_hw_device  *)pci_get_drvdata(vdev->pdev);
192 190
 
193 191
 	if (!is_vxge_card_up(vdev)) {
194 192
 		vxge_debug(VXGE_ERR,
@@ -469,11 +467,9 @@ _out0:
469 467
 void
470 468
 vxge_device_unregister(struct __vxge_hw_device *hldev)
471 469
 {
472
-	struct vxgedev *vdev;
473 470
 	struct net_device *ndev;
474 471
 
475 472
 	ndev = hldev->ndev;
476
-	vdev = netdev_priv(ndev);
477 473
 
478 474
 	unregister_netdev(ndev);
479 475
 	netdev_nullify(ndev);
@@ -504,7 +500,6 @@ vxge_probe(struct pci_device *pdev)
504 500
 	struct vxgedev *vdev;
505 501
 	int i;
506 502
 	u8 revision, titan1;
507
-	u32 host_type;
508 503
 	u32 function_mode;
509 504
 	unsigned long mmio_start, mmio_len;
510 505
 	void *bar0;
@@ -562,7 +557,6 @@ vxge_probe(struct pci_device *pdev)
562 557
 		"%s:%d  Vpath mask = %llx\n", __func__, __LINE__,
563 558
 		(unsigned long long)vpath_mask);
564 559
 
565
-	host_type = hw_info.host_type;
566 560
 	fw_version = &hw_info.fw_version;
567 561
 	/* fail the driver loading if firmware is incompatible */
568 562
 	if ((fw_version->major != VXGE_CERT_FW_VER_MAJOR) ||

+ 1
- 5
src/drivers/net/vxge/vxge_traffic.c View File

@@ -33,7 +33,6 @@ FILE_LICENCE(GPL2_ONLY);
33 33
 enum vxge_hw_status
34 34
 vxge_hw_vpath_intr_enable(struct __vxge_hw_virtualpath *vpath)
35 35
 {
36
-	u64 val64;
37 36
 	struct vxge_hw_vpath_reg *vp_reg;
38 37
 	enum vxge_hw_status status = VXGE_HW_OK;
39 38
 
@@ -79,7 +78,7 @@ vxge_hw_vpath_intr_enable(struct __vxge_hw_virtualpath *vpath)
79 78
 	__vxge_hw_pio_mem_write32_upper((u32)VXGE_HW_INTR_MASK_ALL,
80 79
 				&vp_reg->xgmac_vp_int_status);
81 80
 
82
-	val64 = readq(&vp_reg->vpath_general_int_status);
81
+	readq(&vp_reg->vpath_general_int_status);
83 82
 
84 83
 	/* Mask unwanted interrupts */
85 84
 	__vxge_hw_pio_mem_write32_upper((u32)VXGE_HW_INTR_MASK_ALL,
@@ -149,7 +148,6 @@ exit:
149 148
 enum vxge_hw_status
150 149
 vxge_hw_vpath_intr_disable(struct __vxge_hw_virtualpath *vpath)
151 150
 {
152
-	u64 val64;
153 151
 	enum vxge_hw_status status = VXGE_HW_OK;
154 152
 	struct vxge_hw_vpath_reg __iomem *vp_reg;
155 153
 
@@ -162,8 +160,6 @@ vxge_hw_vpath_intr_disable(struct __vxge_hw_virtualpath *vpath)
162 160
 	__vxge_hw_pio_mem_write32_upper((u32)VXGE_HW_INTR_MASK_ALL,
163 161
 			&vp_reg->vpath_general_int_mask);
164 162
 
165
-	val64 = VXGE_HW_TIM_CLR_INT_EN_VP(1 << (16 - vpath->vp_id));
166
-
167 163
 	writeq(VXGE_HW_INTR_MASK_ALL, &vp_reg->kdfcctl_errors_mask);
168 164
 
169 165
 	__vxge_hw_pio_mem_write32_upper((u32)VXGE_HW_INTR_MASK_ALL,

Loading…
Cancel
Save