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: 328809 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 D6B5A2C18EB for ; Tue, 11 Mar 2014 07:52:37 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755588AbaCJUvP (ORCPT ); Mon, 10 Mar 2014 16:51:15 -0400 Received: from mail-ea0-f171.google.com ([209.85.215.171]:48349 "EHLO mail-ea0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755563AbaCJUvM (ORCPT ); Mon, 10 Mar 2014 16:51:12 -0400 Received: by mail-ea0-f171.google.com with SMTP id n15so3917828ead.16 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 Cc: David Miller , Florian Fainelli , netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org 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> 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/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