[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>

diff --git a/src/drivers/net/vxge/vxge_main.c b/src/drivers/net/vxge/vxge_main.c
index a8812985260841215cc1d51026c32cc6713fcfb5..b8533d311ac7ff7e3b8c93736fb8cc89fbe0032b 100644 (file)
--- a/src/drivers/net/vxge/vxge_main.c
+++ b/src/drivers/net/vxge/vxge_main.c
@@ -182,13 +182,11 @@ vxge_xmit(struct net_device *dev, struct io_buffer *iobuf)
        struct vxge_fifo *fifo = NULL;
        struct vxgedev *vdev = NULL;
        struct __vxge_hw_fifo *fifoh;
-       struct __vxge_hw_device  *hldev;
        struct vxge_hw_fifo_txd *txdp;
 
        vxge_trace();
 
        vdev = (struct vxgedev *)netdev_priv(dev);
-       hldev = (struct __vxge_hw_device  *)pci_get_drvdata(vdev->pdev);
 
        if (!is_vxge_card_up(vdev)) {
                vxge_debug(VXGE_ERR,
@@ -469,11 +467,9 @@ _out0:
 void
 vxge_device_unregister(struct __vxge_hw_device *hldev)
 {
-       struct vxgedev *vdev;
        struct net_device *ndev;
 
        ndev = hldev->ndev;
-       vdev = netdev_priv(ndev);
 
        unregister_netdev(ndev);
        netdev_nullify(ndev);
@@ -504,7 +500,6 @@ vxge_probe(struct pci_device *pdev)
        struct vxgedev *vdev;
        int i;
        u8 revision, titan1;
-       u32 host_type;
        u32 function_mode;
        unsigned long mmio_start, mmio_len;
        void *bar0;
@@ -562,7 +557,6 @@ vxge_probe(struct pci_device *pdev)
                "%s:%d  Vpath mask = %llx\n", __func__, __LINE__,
                (unsigned long long)vpath_mask);
 
-       host_type = hw_info.host_type;
        fw_version = &hw_info.fw_version;
        /* fail the driver loading if firmware is incompatible */
        if ((fw_version->major != VXGE_CERT_FW_VER_MAJOR) ||

diff --git a/src/drivers/net/vxge/vxge_traffic.c b/src/drivers/net/vxge/vxge_traffic.c
index 3bc093cb843b72a3959d146ef84bb2c07a2f50a1..0b1caf106504564065aaeb8ef6894e7b20dae12d 100644 (file)
--- a/src/drivers/net/vxge/vxge_traffic.c
+++ b/src/drivers/net/vxge/vxge_traffic.c
@@ -33,7 +33,6 @@ FILE_LICENCE(GPL2_ONLY);
 enum vxge_hw_status
 vxge_hw_vpath_intr_enable(struct __vxge_hw_virtualpath *vpath)
 {
-       u64 val64;
        struct vxge_hw_vpath_reg *vp_reg;
        enum vxge_hw_status status = VXGE_HW_OK;
 
@@ -79,7 +78,7 @@ vxge_hw_vpath_intr_enable(struct __vxge_hw_virtualpath *vpath)
        __vxge_hw_pio_mem_write32_upper((u32)VXGE_HW_INTR_MASK_ALL,
                                &vp_reg->xgmac_vp_int_status);
 
-       val64 = readq(&vp_reg->vpath_general_int_status);
+       readq(&vp_reg->vpath_general_int_status);
 
        /* Mask unwanted interrupts */
        __vxge_hw_pio_mem_write32_upper((u32)VXGE_HW_INTR_MASK_ALL,
@@ -149,7 +148,6 @@ exit:
 enum vxge_hw_status
 vxge_hw_vpath_intr_disable(struct __vxge_hw_virtualpath *vpath)
 {
-       u64 val64;
        enum vxge_hw_status status = VXGE_HW_OK;
        struct vxge_hw_vpath_reg __iomem *vp_reg;
 
@@ -162,8 +160,6 @@ vxge_hw_vpath_intr_disable(struct __vxge_hw_virtualpath *vpath)
        __vxge_hw_pio_mem_write32_upper((u32)VXGE_HW_INTR_MASK_ALL,
                        &vp_reg->vpath_general_int_mask);
 
-       val64 = VXGE_HW_TIM_CLR_INT_EN_VP(1 << (16 - vpath->vp_id));
-
        writeq(VXGE_HW_INTR_MASK_ALL, &vp_reg->kdfcctl_errors_mask);
 
        __vxge_hw_pio_mem_write32_upper((u32)VXGE_HW_INTR_MASK_ALL,