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: 3806681 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D0BCCBF540 for ; Mon, 10 Mar 2014 20:53:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EA8612022F for ; Mon, 10 Mar 2014 20:53:55 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0F39920213 for ; Mon, 10 Mar 2014 20:53:55 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WN7Ba-0004Zy-Av; Mon, 10 Mar 2014 20:52:35 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WN7BE-0004PW-1o; Mon, 10 Mar 2014 20:52:12 +0000 Received: from mail-ea0-x236.google.com ([2a00:1450:4013:c01::236]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WN7Ac-0004Iu-E7 for linux-arm-kernel@lists.infradead.org; Mon, 10 Mar 2014 20:51:36 +0000 Received: by mail-ea0-f182.google.com with SMTP id b10so3971038eae.27 for ; Mon, 10 Mar 2014 13:51:12 -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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140310_165134_655385_08C6BA02 X-CRM114-Status: GOOD ( 10.63 ) X-Spam-Score: -2.0 (--) Cc: netdev@vger.kernel.org, Florian Fainelli , David Miller , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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)