From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 989ADC43381 for ; Sat, 16 Feb 2019 19:45:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 64C8421B69 for ; Sat, 16 Feb 2019 19:45:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fF7AFGaz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730471AbfBPTpL (ORCPT ); Sat, 16 Feb 2019 14:45:11 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:40335 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726000AbfBPTpJ (ORCPT ); Sat, 16 Feb 2019 14:45:09 -0500 Received: by mail-wr1-f68.google.com with SMTP id q1so13831775wrp.7 for ; Sat, 16 Feb 2019 11:45:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=ehZ1v+LtU6B2TXnwbCYz0Ekaf/BhzaLbCwZyp13VVik=; b=fF7AFGazxjFhisKdpPCGhHF2uT3MGs5WpN56ja1At8YqDuZKW17RTjNjl6c8tzVg7k gGUGjXlVHxHkrQIyACK9eNpR14fSCSrJUnV0nl8BTdOQESOnWRL9jRksw6pnznd1sxJd cud8JRYZXf4bHIQBFHEmNBwAlQl5SEPjTwTSmS6Lp+TT46ngfB2T4zYh84sWgfo0RlfF 5lGWywvHSSyaEZfML8E20kSVrEUiAjVZsUu8B0bBIHdtFPxNiYw/5UNMfjSsbGxAHScp CvnlXXm5EIxwx8seNM7w4GJ0x2qMh+748q21uCWS/sV7XNFvpyep6i29vg62g+P1Ftw2 kgCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=ehZ1v+LtU6B2TXnwbCYz0Ekaf/BhzaLbCwZyp13VVik=; b=C0cCcfab/Ow6astBbiDNFWGtngUBbSxOX4GpEo+9a4D5TGZmaDux0uxJzYUc5osJAT lSc/hC08Yya3aD0EvVqN16iAwEC5CiJStvEAu9WhS96z3wmRsyLDkQXiBxHDY1gtFCZo ONs33v8CmzG454x93YSFj7IyCdMe5bOhlEgUwpehiRmsWOeCnsVRZITtb8y8yXDU1ZLh YwLgp+JvzbjgbOEjc8h9RpiUswiMZUmhJldwJT8H/gHmZB69gIjOxYuIypXWBdaXV9t6 4y+MauiFWm/k0yslY05hOk2qZDuKb8SeUgJCMauzmY0Xkz/8SlUjpg4yXpvmJH67XM3m U4dw== X-Gm-Message-State: AHQUAuaw7X4N0rQbXzmTV8VEu2s7W7JNgQzKQvdSalRB48QPA1mGUCML aWAvuZZqA9vlzToABRvUTtQX5IPt X-Google-Smtp-Source: AHgI3Ib5t8qRIaehORlVHj3C6p9Hia8U0/59DJoSyZK+j3UowcJL/AOKAe04tcpBkNjqITaGkVbH1A== X-Received: by 2002:adf:ed11:: with SMTP id a17mr11243793wro.283.1550346307358; Sat, 16 Feb 2019 11:45:07 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:fc50:d076:bfa9:dffa? (p200300EA8BF1E200FC50D076BFA9DFFA.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:fc50:d076:bfa9:dffa]) by smtp.googlemail.com with ESMTPSA id u184sm25074370wmg.45.2019.02.16.11.45.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Feb 2019 11:45:06 -0800 (PST) Subject: [PATCH v2 net-next 2/2] net: phy: marvell10g: improve mv3310_config_aneg From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller , Russell King - ARM Linux Cc: "netdev@vger.kernel.org" References: Message-ID: <6827daf4-3ee0-c537-2b97-493bcc2a48ab@gmail.com> Date: Sat, 16 Feb 2019 20:44:59 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Now that genphy_c45_pma_setup_forced() makes sure the "aneg enabled" bit is cleared, the call to genphy_c45_an_disable_aneg() isn't needed any longer. And the code pattern is now the same as in genphy_config_aneg(). Signed-off-by: Heiner Kallweit --- drivers/net/phy/marvell10g.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c index 496805c0d..4a6ae63ab 100644 --- a/drivers/net/phy/marvell10g.c +++ b/drivers/net/phy/marvell10g.c @@ -271,13 +271,8 @@ static int mv3310_config_aneg(struct phy_device *phydev) /* We don't support manual MDI control */ phydev->mdix_ctrl = ETH_TP_MDI_AUTO; - if (phydev->autoneg == AUTONEG_DISABLE) { - ret = genphy_c45_pma_setup_forced(phydev); - if (ret < 0) - return ret; - - return genphy_c45_an_disable_aneg(phydev); - } + if (phydev->autoneg == AUTONEG_DISABLE) + return genphy_c45_pma_setup_forced(phydev); linkmode_and(phydev->advertising, phydev->advertising, phydev->supported); -- 2.20.1