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

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

33
 enum vxge_hw_status
33
 enum vxge_hw_status
34
 vxge_hw_vpath_intr_enable(struct __vxge_hw_virtualpath *vpath)
34
 vxge_hw_vpath_intr_enable(struct __vxge_hw_virtualpath *vpath)
35
 {
35
 {
36
-	u64 val64;
37
 	struct vxge_hw_vpath_reg *vp_reg;
36
 	struct vxge_hw_vpath_reg *vp_reg;
38
 	enum vxge_hw_status status = VXGE_HW_OK;
37
 	enum vxge_hw_status status = VXGE_HW_OK;
39
 
38
 
79
 	__vxge_hw_pio_mem_write32_upper((u32)VXGE_HW_INTR_MASK_ALL,
78
 	__vxge_hw_pio_mem_write32_upper((u32)VXGE_HW_INTR_MASK_ALL,
80
 				&vp_reg->xgmac_vp_int_status);
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
 	/* Mask unwanted interrupts */
83
 	/* Mask unwanted interrupts */
85
 	__vxge_hw_pio_mem_write32_upper((u32)VXGE_HW_INTR_MASK_ALL,
84
 	__vxge_hw_pio_mem_write32_upper((u32)VXGE_HW_INTR_MASK_ALL,
149
 enum vxge_hw_status
148
 enum vxge_hw_status
150
 vxge_hw_vpath_intr_disable(struct __vxge_hw_virtualpath *vpath)
149
 vxge_hw_vpath_intr_disable(struct __vxge_hw_virtualpath *vpath)
151
 {
150
 {
152
-	u64 val64;
153
 	enum vxge_hw_status status = VXGE_HW_OK;
151
 	enum vxge_hw_status status = VXGE_HW_OK;
154
 	struct vxge_hw_vpath_reg __iomem *vp_reg;
152
 	struct vxge_hw_vpath_reg __iomem *vp_reg;
155
 
153
 
162
 	__vxge_hw_pio_mem_write32_upper((u32)VXGE_HW_INTR_MASK_ALL,
160
 	__vxge_hw_pio_mem_write32_upper((u32)VXGE_HW_INTR_MASK_ALL,
163
 			&vp_reg->vpath_general_int_mask);
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
 	writeq(VXGE_HW_INTR_MASK_ALL, &vp_reg->kdfcctl_errors_mask);
163
 	writeq(VXGE_HW_INTR_MASK_ALL, &vp_reg->kdfcctl_errors_mask);
168
 
164
 
169
 	__vxge_hw_pio_mem_write32_upper((u32)VXGE_HW_INTR_MASK_ALL,
165
 	__vxge_hw_pio_mem_write32_upper((u32)VXGE_HW_INTR_MASK_ALL,

Loading…
Cancel
Save