From patchwork Mon Mar 10 20:51:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 328803 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 A4F7C2C09E7 for ; Tue, 11 Mar 2014 07:52:18 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755594AbaCJUvQ (ORCPT ); Mon, 10 Mar 2014 16:51:16 -0400 Received: from mail-ea0-f179.google.com ([209.85.215.179]:35404 "EHLO mail-ea0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755340AbaCJUvL (ORCPT ); Mon, 10 Mar 2014 16:51:11 -0400 Received: by mail-ea0-f179.google.com with SMTP id q10so3958571ead.38 for ; Mon, 10 Mar 2014 13:51:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uLZWl7wU2i2zeLg9vq9Pu+KmDvhxCiAH0aLXSv2qpYM=; b=CqAEr3zpyDxsSIWWt195rrhBASv9z1LbsU0usnKiRsU63qrSoTHEJgzUKdgHvs3VML DVaCWQIN8tsgBf32WcOz+/siy0AgWfOs+MM5adW71k5J07zR42S6oE/L7seynkx5rM7a +0Nah+Q5gWOhMCpDQ5p2BciQ69nqVQoTPu97JoBlYRv4hhbASkhSfAVakPCgrHg1Cy1Y Ao+mWDtII3nQXA8I8ux3/j7iIV7NDsxUXDvdJLbAA5YRxjs3IIfgladsY3lYWfgZWMdF +mhJ24JrDB0cLq4L6RhYGXmDmbvjiksvmceynIrGUsRg2/nQ+eNIxUdhgExz9LHe/sM4 v8Ew== X-Received: by 10.14.115.195 with SMTP id e43mr6482391eeh.76.1394484670217; Mon, 10 Mar 2014 13:51:10 -0700 (PDT) Received: from topkick.lan (dslc-082-083-251-183.pools.arcor-ip.net. [82.83.251.183]) by mx.google.com with ESMTPSA id x45sm49164801eef.15.2014.03.10.13.51.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Mar 2014 13:51:08 -0700 (PDT) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Cc: David Miller , Florian Fainelli , netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] net: cpsw: simplify phy_ethtool_get_wol call Date: Mon, 10 Mar 2014 21:51:01 +0100 Message-Id: <1394484661-4554-4-git-send-email-sebastian.hesselbarth@gmail.com> In-Reply-To: <1394484661-4554-1-git-send-email-sebastian.hesselbarth@gmail.com> References: <1394413270-7169-1-git-send-email-sebastian.hesselbarth@gmail.com> <1394484661-4554-1-git-send-email-sebastian.hesselbarth@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org With phy_ethtool_get_wol now clearing struct ethtool_wolinfo, we can simplify routines calling it. Signed-off-by: Sebastian Hesselbarth --- Changelog: v1->v2: - initial Cc: David Miller Cc: Florian Fainelli Cc: netdev@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- drivers/net/ethernet/ti/cpsw.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index bde63e3af96f..06950c75cb2f 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -1726,12 +1726,7 @@ static void cpsw_get_wol(struct net_device *ndev, struct ethtool_wolinfo *wol) { struct cpsw_priv *priv = netdev_priv(ndev); int slave_no = cpsw_slave_index(priv); - - wol->supported = 0; - wol->wolopts = 0; - - if (priv->slaves[slave_no].phy) - phy_ethtool_get_wol(priv->slaves[slave_no].phy, wol); + phy_ethtool_get_wol(priv->slaves[slave_no].phy, wol); } static int cpsw_set_wol(struct net_device *ndev, struct ethtool_wolinfo *wol)