From patchwork Fri Feb 22 18:01:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 222593 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0DBC32C02A0 for ; Sat, 23 Feb 2013 05:01:38 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758859Ab3BVSBf (ORCPT ); Fri, 22 Feb 2013 13:01:35 -0500 Received: from mail-pa0-f50.google.com ([209.85.220.50]:36411 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758820Ab3BVSBd (ORCPT ); Fri, 22 Feb 2013 13:01:33 -0500 Received: by mail-pa0-f50.google.com with SMTP id fa11so596082pad.9 for ; Fri, 22 Feb 2013 10:01:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:date:from:to:cc:subject:message-id:x-mailer:mime-version :content-type:content-transfer-encoding:x-gm-message-state; bh=wAaIXpNs1+i4lX+SfdE3+aiEX3MUvxxHGFw/lhUvqgI=; b=BWoOXttGK8GTGcZ7RCB+uV2p7XQpCuoHGmIT1kPd/rL/sLk5HDYW8H2Ia/zsX0a69R 3xbfIGMSGzYB6GFljhKqM6QuFk2tIenRpDf7KIcSRDifkiHHv4bv0xARXL9sL9Vu+GJt Q6p5N1tzJf/7q2nFgwXlJm9anAzX062qDhZGImCV66su3dexHX4lJtmamNFaXIfthTVR sFuR1U/OrM1GyAYJfn98wmyL7XwkSrwgjiscOFlRNTOp8axWv9RTAF0uy1m5lKy3r2Zl QqKerMtflCsF0J9CeaZ4wuiPQuZAGXWEZaiqGXhyn5t5h0l3fqHnNYMB+GRhCNaadgJv L5uw== X-Received: by 10.66.75.136 with SMTP id c8mr5501857paw.25.1361556092838; Fri, 22 Feb 2013 10:01:32 -0800 (PST) Received: from nehalam.linuxnetplumber.net (static-50-53-71-109.bvtn.or.frontiernet.net. [50.53.71.109]) by mx.google.com with ESMTPS id qf7sm3221963pbb.2.2013.02.22.10.01.31 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 22 Feb 2013 10:01:32 -0800 (PST) Date: Fri, 22 Feb 2013 10:01:10 -0800 From: Stephen Hemminger To: Eilon Greenstein , David Miller Cc: netdev@vger.kernel.org Subject: [PATCH net] bnx2x: remove dead code and make local funcs static Message-ID: <20130222100110.057520e1@nehalam.linuxnetplumber.net> X-Mailer: Claws Mail 3.8.1 (GTK+ 2.24.10; x86_64-pc-linux-gnu) Mime-Version: 1.0 X-Gm-Message-State: ALoCoQmUgs/zPlhFV1D4IX9sr7Ui/G+MWonlNgXqKtrJrBuk0BZljK+nYdB60X+OQf1IJT3gN25O Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Sparse warned about several functions that were unnecessarily global. After making them static, discovered that several functions were actually never used. Compile tested only. Signed-off-by: Stephen Hemminger Acked-by: Eilon Greenstein --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c 2013-01-24 08:39:16.000000000 -0800 +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c 2013-02-21 21:30:43.266173259 -0800 @@ -98,7 +98,7 @@ static inline int bnx2x_pfvf_status_code } } -int bnx2x_send_msg2pf(struct bnx2x *bp, u8 *done, dma_addr_t msg_mapping) +static int bnx2x_send_msg2pf(struct bnx2x *bp, u8 *done, dma_addr_t msg_mapping) { struct cstorm_vf_zone_data __iomem *zone_data = REG_ADDR(bp, PXP_VF_ADDR_CSDM_GLOBAL_START); @@ -141,7 +141,7 @@ int bnx2x_send_msg2pf(struct bnx2x *bp, return 0; } -int bnx2x_get_vf_id(struct bnx2x *bp, u32 *vf_id) +static int bnx2x_get_vf_id(struct bnx2x *bp, u32 *vf_id) { u32 me_reg; int tout = 10, interval = 100; /* Wait for 1 sec */ --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c 2013-02-05 09:22:48.000000000 -0800 +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c 2013-02-21 21:36:46.057481259 -0800 @@ -13013,64 +13013,6 @@ static int bnx2x_84833_common_init_phy(s return 0; } -static int bnx2x_84833_pre_init_phy(struct bnx2x *bp, - struct bnx2x_phy *phy, - u8 port) -{ - u16 val, cnt; - /* Wait for FW completing its initialization. */ - for (cnt = 0; cnt < 1500; cnt++) { - bnx2x_cl45_read(bp, phy, - MDIO_PMA_DEVAD, - MDIO_PMA_REG_CTRL, &val); - if (!(val & (1<<15))) - break; - usleep_range(1000, 2000); - } - if (cnt >= 1500) { - DP(NETIF_MSG_LINK, "84833 reset timeout\n"); - return -EINVAL; - } - - /* Put the port in super isolate mode. */ - bnx2x_cl45_read(bp, phy, - MDIO_CTL_DEVAD, - MDIO_84833_TOP_CFG_XGPHY_STRAP1, &val); - val |= MDIO_84833_SUPER_ISOLATE; - bnx2x_cl45_write(bp, phy, - MDIO_CTL_DEVAD, - MDIO_84833_TOP_CFG_XGPHY_STRAP1, val); - - /* Save spirom version */ - bnx2x_save_848xx_spirom_version(phy, bp, port); - return 0; -} - -int bnx2x_pre_init_phy(struct bnx2x *bp, - u32 shmem_base, - u32 shmem2_base, - u32 chip_id, - u8 port) -{ - int rc = 0; - struct bnx2x_phy phy; - if (bnx2x_populate_phy(bp, EXT_PHY1, shmem_base, shmem2_base, - port, &phy) != 0) { - DP(NETIF_MSG_LINK, "populate_phy failed\n"); - return -EINVAL; - } - bnx2x_set_mdio_clk(bp, chip_id, phy.mdio_ctrl); - switch (phy.type) { - case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833: - case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84834: - rc = bnx2x_84833_pre_init_phy(bp, &phy, port); - break; - default: - break; - } - return rc; -} - static int bnx2x_ext_phy_common_init(struct bnx2x *bp, u32 shmem_base_path[], u32 shmem2_base_path[], u8 phy_index, u32 ext_phy_type, u32 chip_id)