From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DBB62C43381 for ; Wed, 27 Feb 2019 06:09:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 95DE421852 for ; Wed, 27 Feb 2019 06:09:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UFnWzXk0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729927AbfB0GJu (ORCPT ); Wed, 27 Feb 2019 01:09:50 -0500 Received: from mail-pf1-f193.google.com ([209.85.210.193]:40809 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726268AbfB0GJt (ORCPT ); Wed, 27 Feb 2019 01:09:49 -0500 Received: by mail-pf1-f193.google.com with SMTP id h1so7473117pfo.7; Tue, 26 Feb 2019 22:09:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h0BrUqpAYlAu5ZAsA5TS9KE4mIVgCLyHn4vUb/tgnT0=; b=UFnWzXk0SvjGEbh+bYnyMz+7t4AKiXd4ipGptmarO391GbWMW13KafrSD4j+8TfaXI vrXMjFLzK4wiZ7PPkp/0t2BXfWt7iFP+J4DSNjL30KxPt2Wy4//Zat6O+AtnZUrk9B70 DbdmZDubN154ladKiHPnr8xi0DmambReBUhXDJYN2gzQUmEhIWrZNQcqCkzrr6CUJwts iHZH8xPg0viDjkoUy9SsYE+u8fs1egcoPpHmSUe8Em9jbT1x0jMASgL7A/rR4r+bTZrG KyOXuSBo2ffTz//F/OcNA2Q11/0WAdGwNVz6Z+6xPvsk2RjCq9M8CS3QDxfOgWWNSvaE k55w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=h0BrUqpAYlAu5ZAsA5TS9KE4mIVgCLyHn4vUb/tgnT0=; b=GlNI9QBXYWw0H+H9eaVtsleP58oTrhsNySEUeUTPBMjOHtUrGXA7uQlBRXaHcFRVZ2 lnTAgu5OCuaT7Ss6oSbcd8z2CGU44/gyZNPRrLUImll/P42Rk9c1dNdUKGG4nk6bNMuI GHAtA922tPZQkBTtxSPo63cUn7gr3CIfTWCnMLnZsuqiY32y4/TBWwmXeVvWLnoSkhk9 6RdcoV8C3ZbXimHxXNv/rRD9HV10/cCzju9TYkrLhR82fPzWR9I5jA+0rkf/B1dfQRRs HhFXiaeYQb9QZItIB5x40scfGBqIOTpsG88Ora6nDwB3OfAVaSYZyDCmfP+6Arot3PUL gq3w== X-Gm-Message-State: AHQUAubu17ILWbmhdKzfHO9MFpOOxKTuLno2AaOIdok9eI0/VQJkHhmn vxzZluVD2USb+pQYYrTVsHY= X-Google-Smtp-Source: AHgI3IaEz8ZyRRgZV33DdyOl6x5Sa3yNIaEIi+Aeup+QhvjgSf6Q4G+42nLnAds6T+LQ/BIpndk0HQ== X-Received: by 2002:a63:cf01:: with SMTP id j1mr1388965pgg.342.1551247788067; Tue, 26 Feb 2019 22:09:48 -0800 (PST) Received: from bobby.hsd1.or.comcast.net ([2601:1c0:5501:37e2::87c4]) by smtp.googlemail.com with ESMTPSA id d5sm20733473pfo.83.2019.02.26.22.09.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Feb 2019 22:09:47 -0800 (PST) From: Robert Eshleman To: bobbyeshleman@gmail.com Cc: Tariq Toukan , "David S. Miller" , Ariel Elior , GR-everest-linux-l2@marvell.com, netdev@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/8] qed: remove unnecessary memsets Date: Tue, 26 Feb 2019 22:09:51 -0800 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch replaces unnecessary memset(,0) calls with simply assigning structs to zero. Signed-off-by: Robert Eshleman --- drivers/net/ethernet/qlogic/qed/qed_cxt.c | 4 +- drivers/net/ethernet/qlogic/qed/qed_hw.c | 3 +- drivers/net/ethernet/qlogic/qed/qed_mcp.c | 70 ++++++++--------------- 3 files changed, 25 insertions(+), 52 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qed/qed_cxt.c b/drivers/net/ethernet/qlogic/qed/qed_cxt.c index c2ad405b2f50..0452ef2fdf1d 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_cxt.c +++ b/drivers/net/ethernet/qlogic/qed/qed_cxt.c @@ -902,12 +902,10 @@ static int qed_cxt_src_t2_alloc(struct qed_hwfn *p_hwfn) struct qed_cxt_mngr *p_mngr = p_hwfn->p_cxt_mngr; u32 conn_num, total_size, ent_per_page, psz, i; struct qed_ilt_client_cfg *p_src; - struct qed_src_iids src_iids; + struct qed_src_iids src_iids = {0}; struct qed_dma_mem *p_t2; int rc; - memset(&src_iids, 0, sizeof(src_iids)); - /* if the SRC ILT client is inactive - there are no connection * requiring the searcer, leave. */ diff --git a/drivers/net/ethernet/qlogic/qed/qed_hw.c b/drivers/net/ethernet/qlogic/qed/qed_hw.c index 70504dcf4087..b8ca3a31409b 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_hw.c +++ b/drivers/net/ethernet/qlogic/qed/qed_hw.c @@ -831,7 +831,7 @@ int qed_dmae_sanity(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt, const char *phase) { u32 size = PAGE_SIZE / 2, val; - struct qed_dmae_params params; + struct qed_dmae_params params = {0}; int rc = 0; dma_addr_t p_phys; void *p_virt; @@ -864,7 +864,6 @@ int qed_dmae_sanity(struct qed_hwfn *p_hwfn, (u64)p_phys, p_virt, (u64)(p_phys + size), (u8 *)p_virt + size, size); - memset(¶ms, 0, sizeof(params)); rc = qed_dmae_host2host(p_hwfn, p_ptt, p_phys, p_phys + size, size / 4 /* size_in_dwords */, ¶ms); if (rc) { diff --git a/drivers/net/ethernet/qlogic/qed/qed_mcp.c b/drivers/net/ethernet/qlogic/qed/qed_mcp.c index e7f18e34ff0d..e1b72fc819a9 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_mcp.c +++ b/drivers/net/ethernet/qlogic/qed/qed_mcp.c @@ -642,10 +642,9 @@ int qed_mcp_cmd(struct qed_hwfn *p_hwfn, u32 *o_mcp_resp, u32 *o_mcp_param) { - struct qed_mcp_mb_params mb_params; + struct qed_mcp_mb_params mb_params = {0}; int rc; - memset(&mb_params, 0, sizeof(mb_params)); mb_params.cmd = cmd; mb_params.param = param; @@ -667,10 +666,9 @@ qed_mcp_nvm_wr_cmd(struct qed_hwfn *p_hwfn, u32 *o_mcp_resp, u32 *o_mcp_param, u32 i_txn_size, u32 *i_buf) { - struct qed_mcp_mb_params mb_params; + struct qed_mcp_mb_params mb_params = {0}; int rc; - memset(&mb_params, 0, sizeof(mb_params)); mb_params.cmd = cmd; mb_params.param = param; mb_params.p_data_src = i_buf; @@ -695,11 +693,10 @@ int qed_mcp_nvm_rd_cmd(struct qed_hwfn *p_hwfn, u32 *o_mcp_resp, u32 *o_mcp_param, u32 *o_txn_size, u32 *o_buf) { - struct qed_mcp_mb_params mb_params; + struct qed_mcp_mb_params mb_params = {0}; u8 raw_data[MCP_DRV_NVM_BUF_LEN]; int rc; - memset(&mb_params, 0, sizeof(mb_params)); mb_params.cmd = cmd; mb_params.param = param; mb_params.p_data_dst = raw_data; @@ -821,13 +818,12 @@ __qed_mcp_load_req(struct qed_hwfn *p_hwfn, struct qed_load_req_in_params *p_in_params, struct qed_load_req_out_params *p_out_params) { - struct qed_mcp_mb_params mb_params; - struct load_req_stc load_req; + struct qed_mcp_mb_params mb_params = {0}; + struct load_req_stc load_req = {0}; struct load_rsp_stc load_rsp; u32 hsi_ver; int rc; - memset(&load_req, 0, sizeof(load_req)); load_req.drv_ver_0 = p_in_params->drv_ver_0; load_req.drv_ver_1 = p_in_params->drv_ver_1; load_req.fw_ver = p_in_params->fw_ver; @@ -843,7 +839,6 @@ __qed_mcp_load_req(struct qed_hwfn *p_hwfn, DRV_ID_MCP_HSI_VER_CURRENT : (p_in_params->hsi_ver << DRV_ID_MCP_HSI_VER_SHIFT); - memset(&mb_params, 0, sizeof(mb_params)); mb_params.cmd = DRV_MSG_CODE_LOAD_REQ; mb_params.param = PDA_COMP | hsi_ver | p_hwfn->cdev->drv_type; mb_params.p_data_src = &load_req; @@ -959,12 +954,11 @@ int qed_mcp_load_req(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt, struct qed_load_req_params *p_params) { - struct qed_load_req_out_params out_params; - struct qed_load_req_in_params in_params; + struct qed_load_req_out_params out_params = {0}; + struct qed_load_req_in_params in_params = {0}; u8 mfw_drv_role, mfw_force_cmd; int rc; - memset(&in_params, 0, sizeof(in_params)); in_params.hsi_ver = QED_LOAD_REQ_HSI_VER_DEFAULT; in_params.drv_ver_0 = QED_VERSION; in_params.drv_ver_1 = qed_get_config_bitmap(); @@ -981,7 +975,6 @@ int qed_mcp_load_req(struct qed_hwfn *p_hwfn, in_params.force_cmd = mfw_force_cmd; in_params.avoid_eng_reset = p_params->avoid_eng_reset; - memset(&out_params, 0, sizeof(out_params)); rc = __qed_mcp_load_req(p_hwfn, p_ptt, &in_params, &out_params); if (rc) return rc; @@ -1072,7 +1065,7 @@ int qed_mcp_load_req(struct qed_hwfn *p_hwfn, int qed_mcp_unload_req(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) { - struct qed_mcp_mb_params mb_params; + struct qed_mcp_mb_params mb_params = {0}; u32 wol_param; switch (p_hwfn->cdev->wol_config) { @@ -1091,7 +1084,6 @@ int qed_mcp_unload_req(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) wol_param = DRV_MB_PARAM_UNLOAD_WOL_MCP; } - memset(&mb_params, 0, sizeof(mb_params)); mb_params.cmd = DRV_MSG_CODE_UNLOAD_REQ; mb_params.param = wol_param; mb_params.flags = QED_MB_FLAG_CAN_SLEEP | QED_MB_FLAG_AVOID_BLOCK; @@ -1101,17 +1093,15 @@ int qed_mcp_unload_req(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) int qed_mcp_unload_done(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) { - struct qed_mcp_mb_params mb_params; - struct mcp_mac wol_mac; + struct qed_mcp_mb_params mb_params = {0}; + struct mcp_mac wol_mac = {0}; - memset(&mb_params, 0, sizeof(mb_params)); mb_params.cmd = DRV_MSG_CODE_UNLOAD_DONE; /* Set the primary MAC if WoL is enabled */ if (p_hwfn->cdev->wol_config == QED_OV_WOL_ENABLED) { u8 *p_mac = p_hwfn->cdev->wol_mac; - memset(&wol_mac, 0, sizeof(wol_mac)); wol_mac.mac_upper = p_mac[0] << 8 | p_mac[1]; wol_mac.mac_lower = p_mac[2] << 24 | p_mac[3] << 16 | p_mac[4] << 8 | p_mac[5]; @@ -1167,7 +1157,7 @@ int qed_mcp_ack_vf_flr(struct qed_hwfn *p_hwfn, u32 mfw_func_offsize = qed_rd(p_hwfn, p_ptt, addr); u32 func_addr = SECTION_ADDR(mfw_func_offsize, MCP_PF_ID(p_hwfn)); - struct qed_mcp_mb_params mb_params; + struct qed_mcp_mb_params mb_params = {0}; int rc; int i; @@ -1176,7 +1166,6 @@ int qed_mcp_ack_vf_flr(struct qed_hwfn *p_hwfn, "Acking VFs [%08x,...,%08x] - %08x\n", i * 32, (i + 1) * 32 - 1, vfs_to_ack[i]); - memset(&mb_params, 0, sizeof(mb_params)); mb_params.cmd = DRV_MSG_CODE_VF_DISABLED_DONE; mb_params.p_data_src = vfs_to_ack; mb_params.data_src_size = VF_MAX_STATIC / 8; @@ -1455,13 +1444,12 @@ static void qed_mcp_handle_link_change(struct qed_hwfn *p_hwfn, int qed_mcp_set_link(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt, bool b_up) { struct qed_mcp_link_params *params = &p_hwfn->mcp_info->link_input; - struct qed_mcp_mb_params mb_params; - struct eth_phy_cfg phy_cfg; + struct qed_mcp_mb_params mb_params = {0}; + struct eth_phy_cfg phy_cfg = {0}; int rc = 0; u32 cmd; /* Set the shmem configuration according to params */ - memset(&phy_cfg, 0, sizeof(phy_cfg)); cmd = b_up ? DRV_MSG_CODE_INIT_PHY : DRV_MSG_CODE_LINK_RESET; if (!params->speed.autoneg) phy_cfg.speed = params->speed.forced_speed; @@ -1505,7 +1493,6 @@ int qed_mcp_set_link(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt, bool b_up) "Resetting link\n"); } - memset(&mb_params, 0, sizeof(mb_params)); mb_params.cmd = cmd; mb_params.p_data_src = &phy_cfg; mb_params.data_src_size = sizeof(phy_cfg); @@ -1534,7 +1521,7 @@ static void qed_mcp_send_protocol_stats(struct qed_hwfn *p_hwfn, { enum qed_mcp_protocol_type stats_type; union qed_mcp_protocol_stats stats; - struct qed_mcp_mb_params mb_params; + struct qed_mcp_mb_params mb_params = {0}; u32 hsi_param; switch (type) { @@ -1561,7 +1548,6 @@ static void qed_mcp_send_protocol_stats(struct qed_hwfn *p_hwfn, qed_get_protocol_stats(p_hwfn->cdev, stats_type, &stats); - memset(&mb_params, 0, sizeof(mb_params)); mb_params.cmd = DRV_MSG_CODE_GET_STATS; mb_params.param = hsi_param; mb_params.p_data_src = &stats; @@ -2370,20 +2356,18 @@ qed_mcp_send_drv_version(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt, struct qed_mcp_drv_version *p_ver) { - struct qed_mcp_mb_params mb_params; - struct drv_version_stc drv_version; + struct qed_mcp_mb_params mb_params = {0}; + struct drv_version_stc drv_version = {0}; __be32 val; u32 i; int rc; - memset(&drv_version, 0, sizeof(drv_version)); drv_version.version = p_ver->version; for (i = 0; i < (MCP_DRV_VER_STR_SIZE - 4) / sizeof(u32); i++) { val = cpu_to_be32(*((u32 *)&p_ver->name[i * sizeof(u32)])); *(__be32 *)&drv_version.name[i * sizeof(u32)] = val; } - memset(&mb_params, 0, sizeof(mb_params)); mb_params.cmd = DRV_MSG_CODE_SET_VERSION; mb_params.p_data_src = &drv_version; mb_params.data_src_size = sizeof(drv_version); @@ -2536,11 +2520,10 @@ int qed_mcp_ov_update_mtu(struct qed_hwfn *p_hwfn, int qed_mcp_ov_update_mac(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt, u8 *mac) { - struct qed_mcp_mb_params mb_params; + struct qed_mcp_mb_params mb_params = {0}; u32 mfw_mac[2]; int rc; - memset(&mb_params, 0, sizeof(mb_params)); mb_params.cmd = DRV_MSG_CODE_SET_VMAC; mb_params.param = DRV_MSG_CODE_VMAC_TYPE_MAC << DRV_MSG_CODE_VMAC_TYPE_SHIFT; @@ -3197,12 +3180,10 @@ qed_mcp_resc_allocation_msg(struct qed_hwfn *p_hwfn, struct qed_resc_alloc_in_params *p_in_params, struct qed_resc_alloc_out_params *p_out_params) { - struct qed_mcp_mb_params mb_params; - struct resource_info mfw_resc_info; + struct qed_mcp_mb_params mb_params = {0}; + struct resource_info mfw_resc_info = {0}; int rc; - memset(&mfw_resc_info, 0, sizeof(mfw_resc_info)); - mfw_resc_info.res_id = qed_mcp_get_mfw_res_id(p_in_params->res_id); if (mfw_resc_info.res_id == RESOURCE_NUM_INVALID) { DP_ERR(p_hwfn, @@ -3224,7 +3205,6 @@ qed_mcp_resc_allocation_msg(struct qed_hwfn *p_hwfn, return -EINVAL; } - memset(&mb_params, 0, sizeof(mb_params)); mb_params.cmd = p_in_params->cmd; mb_params.param = QED_RESC_ALLOC_VERSION; mb_params.p_data_src = &mfw_resc_info; @@ -3277,15 +3257,13 @@ qed_mcp_set_resc_max_val(struct qed_hwfn *p_hwfn, enum qed_resources res_id, u32 resc_max_val, u32 *p_mcp_resp) { - struct qed_resc_alloc_out_params out_params; - struct qed_resc_alloc_in_params in_params; + struct qed_resc_alloc_out_params out_params = {0}; + struct qed_resc_alloc_in_params in_params = {0}; int rc; - memset(&in_params, 0, sizeof(in_params)); in_params.cmd = DRV_MSG_SET_RESOURCE_VALUE_MSG; in_params.res_id = res_id; in_params.resc_max_val = resc_max_val; - memset(&out_params, 0, sizeof(out_params)); rc = qed_mcp_resc_allocation_msg(p_hwfn, p_ptt, &in_params, &out_params); if (rc) @@ -3302,14 +3280,12 @@ qed_mcp_get_resc_info(struct qed_hwfn *p_hwfn, enum qed_resources res_id, u32 *p_mcp_resp, u32 *p_resc_num, u32 *p_resc_start) { - struct qed_resc_alloc_out_params out_params; - struct qed_resc_alloc_in_params in_params; + struct qed_resc_alloc_out_params out_params = {0}; + struct qed_resc_alloc_in_params in_params = {0}; int rc; - memset(&in_params, 0, sizeof(in_params)); in_params.cmd = DRV_MSG_GET_RESOURCE_ALLOC_MSG; in_params.res_id = res_id; - memset(&out_params, 0, sizeof(out_params)); rc = qed_mcp_resc_allocation_msg(p_hwfn, p_ptt, &in_params, &out_params); if (rc) -- 2.20.1