Commit e4effc09 authored by Colin Ian King's avatar Colin Ian King Committed by David S. Miller

net: vxge: remove redundant assignments and pointers

There are several pointers that are being assigned but never read
so remove these as they are redundant.  Also remove an assignment
to function_mode that is never read. Cleans up several clang
warnings:

vxge-main.c:1139:2: warning: Value stored to 'hldev' is never read
vxge-main.c:1294:2: warning: Value stored to 'hldev' is never read
vxge-main.c:2188:2: warning: Value stored to 'dev' is never read
vxge-main.c:2188:2: warning: Value stored to 'dev' is never read
vxge-main.c:2723:2: warning: Value stored to 'function_mode' is
never read
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent be61a484
...@@ -1122,7 +1122,6 @@ static void vxge_set_multicast(struct net_device *dev) ...@@ -1122,7 +1122,6 @@ static void vxge_set_multicast(struct net_device *dev)
struct netdev_hw_addr *ha; struct netdev_hw_addr *ha;
struct vxgedev *vdev; struct vxgedev *vdev;
int i, mcast_cnt = 0; int i, mcast_cnt = 0;
struct __vxge_hw_device *hldev;
struct vxge_vpath *vpath; struct vxge_vpath *vpath;
enum vxge_hw_status status = VXGE_HW_OK; enum vxge_hw_status status = VXGE_HW_OK;
struct macInfo mac_info; struct macInfo mac_info;
...@@ -1136,7 +1135,6 @@ static void vxge_set_multicast(struct net_device *dev) ...@@ -1136,7 +1135,6 @@ static void vxge_set_multicast(struct net_device *dev)
"%s:%d", __func__, __LINE__); "%s:%d", __func__, __LINE__);
vdev = netdev_priv(dev); vdev = netdev_priv(dev);
hldev = vdev->devh;
if (unlikely(!is_vxge_card_up(vdev))) if (unlikely(!is_vxge_card_up(vdev)))
return; return;
...@@ -1283,7 +1281,6 @@ static int vxge_set_mac_addr(struct net_device *dev, void *p) ...@@ -1283,7 +1281,6 @@ static int vxge_set_mac_addr(struct net_device *dev, void *p)
{ {
struct sockaddr *addr = p; struct sockaddr *addr = p;
struct vxgedev *vdev; struct vxgedev *vdev;
struct __vxge_hw_device *hldev;
enum vxge_hw_status status = VXGE_HW_OK; enum vxge_hw_status status = VXGE_HW_OK;
struct macInfo mac_info_new, mac_info_old; struct macInfo mac_info_new, mac_info_old;
int vpath_idx = 0; int vpath_idx = 0;
...@@ -1291,7 +1288,6 @@ static int vxge_set_mac_addr(struct net_device *dev, void *p) ...@@ -1291,7 +1288,6 @@ static int vxge_set_mac_addr(struct net_device *dev, void *p)
vxge_debug_entryexit(VXGE_TRACE, "%s:%d", __func__, __LINE__); vxge_debug_entryexit(VXGE_TRACE, "%s:%d", __func__, __LINE__);
vdev = netdev_priv(dev); vdev = netdev_priv(dev);
hldev = vdev->devh;
if (!is_valid_ether_addr(addr->sa_data)) if (!is_valid_ether_addr(addr->sa_data))
return -EINVAL; return -EINVAL;
...@@ -2177,7 +2173,6 @@ static void adaptive_coalesce_rx_interrupts(struct vxge_ring *ring) ...@@ -2177,7 +2173,6 @@ static void adaptive_coalesce_rx_interrupts(struct vxge_ring *ring)
*/ */
static irqreturn_t vxge_isr_napi(int irq, void *dev_id) static irqreturn_t vxge_isr_napi(int irq, void *dev_id)
{ {
struct net_device *dev;
struct __vxge_hw_device *hldev; struct __vxge_hw_device *hldev;
u64 reason; u64 reason;
enum vxge_hw_status status; enum vxge_hw_status status;
...@@ -2185,7 +2180,6 @@ static irqreturn_t vxge_isr_napi(int irq, void *dev_id) ...@@ -2185,7 +2180,6 @@ static irqreturn_t vxge_isr_napi(int irq, void *dev_id)
vxge_debug_intr(VXGE_TRACE, "%s:%d", __func__, __LINE__); vxge_debug_intr(VXGE_TRACE, "%s:%d", __func__, __LINE__);
dev = vdev->ndev;
hldev = pci_get_drvdata(vdev->pdev); hldev = pci_get_drvdata(vdev->pdev);
if (pci_channel_offline(vdev->pdev)) if (pci_channel_offline(vdev->pdev))
...@@ -2713,14 +2707,13 @@ static int vxge_open(struct net_device *dev) ...@@ -2713,14 +2707,13 @@ static int vxge_open(struct net_device *dev)
struct vxge_vpath *vpath; struct vxge_vpath *vpath;
int ret = 0; int ret = 0;
int i; int i;
u64 val64, function_mode; u64 val64;
vxge_debug_entryexit(VXGE_TRACE, vxge_debug_entryexit(VXGE_TRACE,
"%s: %s:%d", dev->name, __func__, __LINE__); "%s: %s:%d", dev->name, __func__, __LINE__);
vdev = netdev_priv(dev); vdev = netdev_priv(dev);
hldev = pci_get_drvdata(vdev->pdev); hldev = pci_get_drvdata(vdev->pdev);
function_mode = vdev->config.device_hw_info.function_mode;
/* make sure you have link off by default every time Nic is /* make sure you have link off by default every time Nic is
* initialized */ * initialized */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment