aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorRasmus Villemoes <linux@rasmusvillemoes.dk>2015-09-09 04:38:05 -0400
committerDavid S. Miller <davem@davemloft.net>2015-09-09 20:06:01 -0400
commit1f0ca208531a152e1da6aa43d095fe0b2039d9ca (patch)
tree46fce4b9df9e279f08ea3a5dfda07866d95ab660 /drivers/net/ethernet
parentb66a60857ca4fae5900c5d81c2ba04e657509b99 (diff)
net: qlcnic: delete redundant memsets
In all cases, mbx->req.arg and mbx->rsp.arg have just been allocated using kcalloc(), so these six memsets are redundant. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c2
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c2
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c2
3 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
index 5ab3adf88166..9f0bdd993955 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
@@ -918,8 +918,6 @@ int qlcnic_83xx_alloc_mbx_args(struct qlcnic_cmd_args *mbx,
918 mbx->req.arg = NULL; 918 mbx->req.arg = NULL;
919 return -ENOMEM; 919 return -ENOMEM;
920 } 920 }
921 memset(mbx->req.arg, 0, sizeof(u32) * mbx->req.num);
922 memset(mbx->rsp.arg, 0, sizeof(u32) * mbx->rsp.num);
923 temp = adapter->ahw->fw_hal_version << 29; 921 temp = adapter->ahw->fw_hal_version << 29;
924 mbx->req.arg[0] = (type | (mbx->req.num << 16) | temp); 922 mbx->req.arg[0] = (type | (mbx->req.num << 16) | temp);
925 mbx->cmd_op = type; 923 mbx->cmd_op = type;
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
index 6e6f18fc5d76..a5f422f26cb4 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
@@ -73,8 +73,6 @@ int qlcnic_82xx_alloc_mbx_args(struct qlcnic_cmd_args *mbx,
73 mbx->req.arg = NULL; 73 mbx->req.arg = NULL;
74 return -ENOMEM; 74 return -ENOMEM;
75 } 75 }
76 memset(mbx->req.arg, 0, sizeof(u32) * mbx->req.num);
77 memset(mbx->rsp.arg, 0, sizeof(u32) * mbx->rsp.num);
78 mbx->req.arg[0] = type; 76 mbx->req.arg[0] = type;
79 break; 77 break;
80 } 78 }
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
index 546cd5f1c85a..7327b729ba2e 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
@@ -729,8 +729,6 @@ static int qlcnic_sriov_alloc_bc_mbx_args(struct qlcnic_cmd_args *mbx, u32 type)
729 mbx->req.arg = NULL; 729 mbx->req.arg = NULL;
730 return -ENOMEM; 730 return -ENOMEM;
731 } 731 }
732 memset(mbx->req.arg, 0, sizeof(u32) * mbx->req.num);
733 memset(mbx->rsp.arg, 0, sizeof(u32) * mbx->rsp.num);
734 mbx->req.arg[0] = (type | (mbx->req.num << 16) | 732 mbx->req.arg[0] = (type | (mbx->req.num << 16) |
735 (3 << 29)); 733 (3 << 29));
736 mbx->rsp.arg[0] = (type & 0xffff) | mbx->rsp.num << 16; 734 mbx->rsp.arg[0] = (type & 0xffff) | mbx->rsp.num << 16;