From patchwork Mon Mar 10 20:51:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 3806611 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 71110BF540 for ; Mon, 10 Mar 2014 20:52:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 87C9C20213 for ; Mon, 10 Mar 2014 20:52:26 +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 9824D2020F for ; Mon, 10 Mar 2014 20:52:25 +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 1WN7Ax-0004FA-6S; Mon, 10 Mar 2014 20:51:55 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WN7Ar-0004NB-Dp; Mon, 10 Mar 2014 20:51:49 +0000 Received: from mail-ea0-x234.google.com ([2a00:1450:4013:c01::234]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WN7Aa-0004Is-RY for linux-arm-kernel@lists.infradead.org; Mon, 10 Mar 2014 20:51:33 +0000 Received: by mail-ea0-f180.google.com with SMTP id m10so3931295eaj.11 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=NJSlKSlNKSTUW/jZzpfaeUqEKGk37la+YdExvDPWHOg=; b=ulmXAfckVHQXXEMkoN3FkAzwHTJhLaP3bkEgEDrS/GMI4ljHY0A8xsT/McTBMj3kxw UhtZ4jgkFTztrlzPb94XBwmzllzht3AoBC3of2UahCek4GxKJHkl9JBzLOhCYvDSGZVI rLgByODzVApxd6Tihc5mdEhekJzGjzzNM6QNDjMeZzGwgSf/lGYkbTU5MgN+nacDCYZF nzbnn87TMilqmT1PND5h0CMEBUZI03HoANwwVbBlH/sZq/KlszTwgZ6tPJTOK9txaelz PXM08l2Ben6+OLH4blnONtlXYZDP2e9v74QdOGxG3ji98HctfWbQcPetxtxDf9oqnWWM eEMA== X-Received: by 10.14.106.193 with SMTP id m41mr6478066eeg.62.1394484670844; 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 m42sm49161618eex.21.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 2/3] net: mv643xx_eth: simplify phy_ethtool_get_wol call Date: Mon, 10 Mar 2014 21:51:00 +0100 Message-Id: <1394484661-4554-3-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_165133_008111_1816CFA7 X-CRM114-Status: GOOD ( 10.47 ) 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/marvell/mv643xx_eth.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index a2565ce22b7c..729464ecce2a 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c @@ -1336,10 +1336,7 @@ static void mv643xx_eth_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol) { struct mv643xx_eth_private *mp = netdev_priv(dev); - wol->supported = 0; - wol->wolopts = 0; - if (mp->phy) - phy_ethtool_get_wol(mp->phy, wol); + phy_ethtool_get_wol(mp->phy, wol); } static int