From patchwork Tue Apr 12 23:30:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 90884 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 D4F2BB6EF1 for ; Wed, 13 Apr 2011 09:30:52 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756892Ab1DLXas (ORCPT ); Tue, 12 Apr 2011 19:30:48 -0400 Received: from rcsinet10.oracle.com ([148.87.113.121]:42462 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756180Ab1DLXar (ORCPT ); Tue, 12 Apr 2011 19:30:47 -0400 Received: from rcsinet13.oracle.com (rcsinet13.oracle.com [148.87.113.125]) by rcsinet10.oracle.com (Switch-3.4.2/Switch-3.4.2) with ESMTP id p3CNUasl021050 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 12 Apr 2011 23:30:38 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by rcsinet13.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id p3CNUZK9007959 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 12 Apr 2011 23:30:36 GMT Received: from abhmt019.oracle.com (abhmt019.oracle.com [141.146.116.28]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id p3CNUZ65018762; Tue, 12 Apr 2011 18:30:35 -0500 Received: from linux-siqj.site (/10.6.76.16) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 12 Apr 2011 16:30:35 -0700 Message-ID: <4DA4E099.2080206@kernel.org> Date: Tue, 12 Apr 2011 16:30:33 -0700 From: Yinghai Lu User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.14) Gecko/20110221 SUSE/3.1.8 Thunderbird/3.1.8 MIME-Version: 1.0 To: Jeff Kirsher , Jesse Brandeburg CC: e1000-devel@lists.sourceforge.net, NetDev Subject: [PATCH] ixgbe: Remove not used blink_led_start/stop code References: <4DA4E016.1050800@kernel.org> In-Reply-To: <4DA4E016.1050800@kernel.org> X-Source-IP: acsmt357.oracle.com [141.146.40.157] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090202.4DA4E09C.00D2,ss=1,fgs=0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There is no user for those code. Signed-off-by: Yinghai Lu --- drivers/net/ixgbe/ixgbe_82598.c | 2 - drivers/net/ixgbe/ixgbe_82599.c | 2 - drivers/net/ixgbe/ixgbe_common.c | 56 --------------------------------------- drivers/net/ixgbe/ixgbe_common.h | 2 - drivers/net/ixgbe/ixgbe_type.h | 2 - drivers/net/ixgbe/ixgbe_x540.c | 2 - 6 files changed, 66 deletions(-) -- 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 Index: linux-2.6/drivers/net/ixgbe/ixgbe_82598.c =================================================================== --- linux-2.6.orig/drivers/net/ixgbe/ixgbe_82598.c +++ linux-2.6/drivers/net/ixgbe/ixgbe_82598.c @@ -1207,8 +1207,6 @@ static struct ixgbe_mac_operations mac_o .get_link_capabilities = &ixgbe_get_link_capabilities_82598, .led_on = &ixgbe_led_on_generic, .led_off = &ixgbe_led_off_generic, - .blink_led_start = &ixgbe_blink_led_start_generic, - .blink_led_stop = &ixgbe_blink_led_stop_generic, .set_rar = &ixgbe_set_rar_generic, .clear_rar = &ixgbe_clear_rar_generic, .set_vmdq = &ixgbe_set_vmdq_82598, Index: linux-2.6/drivers/net/ixgbe/ixgbe_82599.c =================================================================== --- linux-2.6.orig/drivers/net/ixgbe/ixgbe_82599.c +++ linux-2.6/drivers/net/ixgbe/ixgbe_82599.c @@ -2052,8 +2052,6 @@ static struct ixgbe_mac_operations mac_o .get_link_capabilities = &ixgbe_get_link_capabilities_82599, .led_on = &ixgbe_led_on_generic, .led_off = &ixgbe_led_off_generic, - .blink_led_start = &ixgbe_blink_led_start_generic, - .blink_led_stop = &ixgbe_blink_led_stop_generic, .set_rar = &ixgbe_set_rar_generic, .clear_rar = &ixgbe_clear_rar_generic, .set_vmdq = &ixgbe_set_vmdq_generic, Index: linux-2.6/drivers/net/ixgbe/ixgbe_common.c =================================================================== --- linux-2.6.orig/drivers/net/ixgbe/ixgbe_common.c +++ linux-2.6/drivers/net/ixgbe/ixgbe_common.c @@ -2242,62 +2242,6 @@ s32 ixgbe_enable_rx_dma_generic(struct i } /** - * ixgbe_blink_led_start_generic - Blink LED based on index. - * @hw: pointer to hardware structure - * @index: led number to blink - **/ -s32 ixgbe_blink_led_start_generic(struct ixgbe_hw *hw, u32 index) -{ - ixgbe_link_speed speed = 0; - bool link_up = 0; - u32 autoc_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC); - u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL); - - /* - * Link must be up to auto-blink the LEDs; - * Force it if link is down. - */ - hw->mac.ops.check_link(hw, &speed, &link_up, false); - - if (!link_up) { - autoc_reg |= IXGBE_AUTOC_AN_RESTART; - autoc_reg |= IXGBE_AUTOC_FLU; - IXGBE_WRITE_REG(hw, IXGBE_AUTOC, autoc_reg); - msleep(10); - } - - led_reg &= ~IXGBE_LED_MODE_MASK(index); - led_reg |= IXGBE_LED_BLINK(index); - IXGBE_WRITE_REG(hw, IXGBE_LEDCTL, led_reg); - IXGBE_WRITE_FLUSH(hw); - - return 0; -} - -/** - * ixgbe_blink_led_stop_generic - Stop blinking LED based on index. - * @hw: pointer to hardware structure - * @index: led number to stop blinking - **/ -s32 ixgbe_blink_led_stop_generic(struct ixgbe_hw *hw, u32 index) -{ - u32 autoc_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC); - u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL); - - autoc_reg &= ~IXGBE_AUTOC_FLU; - autoc_reg |= IXGBE_AUTOC_AN_RESTART; - IXGBE_WRITE_REG(hw, IXGBE_AUTOC, autoc_reg); - - led_reg &= ~IXGBE_LED_MODE_MASK(index); - led_reg &= ~IXGBE_LED_BLINK(index); - led_reg |= IXGBE_LED_LINK_ACTIVE << IXGBE_LED_MODE_SHIFT(index); - IXGBE_WRITE_REG(hw, IXGBE_LEDCTL, led_reg); - IXGBE_WRITE_FLUSH(hw); - - return 0; -} - -/** * ixgbe_get_san_mac_addr_offset - Get SAN MAC address offset from the EEPROM * @hw: pointer to hardware structure * @san_mac_offset: SAN MAC address offset Index: linux-2.6/drivers/net/ixgbe/ixgbe_common.h =================================================================== --- linux-2.6.orig/drivers/net/ixgbe/ixgbe_common.h +++ linux-2.6/drivers/net/ixgbe/ixgbe_common.h @@ -85,8 +85,6 @@ s32 ixgbe_check_mac_link_generic(struct bool *link_up, bool link_up_wait_to_complete); s32 ixgbe_get_wwn_prefix_generic(struct ixgbe_hw *hw, u16 *wwnn_prefix, u16 *wwpn_prefix); -s32 ixgbe_blink_led_start_generic(struct ixgbe_hw *hw, u32 index); -s32 ixgbe_blink_led_stop_generic(struct ixgbe_hw *hw, u32 index); void ixgbe_set_mac_anti_spoofing(struct ixgbe_hw *hw, bool enable, int pf); void ixgbe_set_vlan_anti_spoofing(struct ixgbe_hw *hw, bool enable, int vf); Index: linux-2.6/drivers/net/ixgbe/ixgbe_type.h =================================================================== --- linux-2.6.orig/drivers/net/ixgbe/ixgbe_type.h +++ linux-2.6/drivers/net/ixgbe/ixgbe_type.h @@ -2530,8 +2530,6 @@ struct ixgbe_mac_operations { /* LED */ s32 (*led_on)(struct ixgbe_hw *, u32); s32 (*led_off)(struct ixgbe_hw *, u32); - s32 (*blink_led_start)(struct ixgbe_hw *, u32); - s32 (*blink_led_stop)(struct ixgbe_hw *, u32); /* RAR, Multicast, VLAN */ s32 (*set_rar)(struct ixgbe_hw *, u32, u8 *, u32, u32); Index: linux-2.6/drivers/net/ixgbe/ixgbe_x540.c =================================================================== --- linux-2.6.orig/drivers/net/ixgbe/ixgbe_x540.c +++ linux-2.6/drivers/net/ixgbe/ixgbe_x540.c @@ -681,8 +681,6 @@ static struct ixgbe_mac_operations mac_o .get_link_capabilities = &ixgbe_get_copper_link_capabilities_generic, .led_on = &ixgbe_led_on_generic, .led_off = &ixgbe_led_off_generic, - .blink_led_start = &ixgbe_blink_led_start_generic, - .blink_led_stop = &ixgbe_blink_led_stop_generic, .set_rar = &ixgbe_set_rar_generic, .clear_rar = &ixgbe_clear_rar_generic, .set_vmdq = &ixgbe_set_vmdq_generic,