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 0117FC43381 for ; Sat, 16 Feb 2019 19:12:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BE8132192D for ; Sat, 16 Feb 2019 19:12:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ompBKckB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732501AbfBPTMH (ORCPT ); Sat, 16 Feb 2019 14:12:07 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:43034 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732474AbfBPTMH (ORCPT ); Sat, 16 Feb 2019 14:12:07 -0500 Received: by mail-wr1-f67.google.com with SMTP id r2so13753074wrv.10 for ; Sat, 16 Feb 2019 11:12:06 -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=ompBKckBoGSpldMqQGW6lSNC3izh3rgF3+IW89pwAmNnaQvQK7bwKuWSaa3hQrihhC gLmLEXhOz7Oyz2tXm3w01QuOEzIcDrQhtYH0+kBofHqzZhMG76RBr0Q8s8+RJ3r63DKz uR+uDVaTTzRSdS7tI9DJntgRNVU0hiScsGRpeczHvXcTZwTSrGifo3hrI2xcyLPiX3wF UcfAqbrHcYDH/6Ez1FE1+L/dGTLu+PCcpL03dG0mxJrLqpx6MbkwKYxrHXvPrBDw70lp SQk7LKrU+whYmP/E8ER5/8IM3mA9IcYwpFtnC4M10zn3KjimTf4puEtjFP+3/sW2fQhu K8kQ== 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=a8FgJ6/hdbBhQ+tTq4VHwASXbVnTdv8+eqmqzb9gwpQPiAU7N2hUOfpPf5axtEfThU RSGgaK0iXKk5u9Fki8jxLJTZXApT+KDR1wx4FtXFyZ4j2gZ8448nYZzZCovTDm3407fo 96bhFAFlyl7llZLwbXIaTy99wOTFy/QPCUWQ+kVOefqhTFLkyoFpx9Hy0/N0LMTsp0QC MlsLB1ieMbYq27zJM3EUbhmwXShyMUyLFvt3YPJa/8cPBb7aB0XZLpSHGQ7egXg5ZJQt m+FN6OhHRRQZYqtNvg0Qzo+kIhcoTFn4H3lzG/lcBdJwORSHArI1Jdk5rI1Ttei67rhX Tx5g== X-Gm-Message-State: AHQUAuaY2AUc3F6gjfSuuzB6DNfgB5e2KUHs+W5UfafIrboze7kNOQS/ kygHeaU4biLu0K+FFf2+sRCUAiqV X-Google-Smtp-Source: AHgI3IaY066hACdolI719B75FTj11OsKD4dskxzpBTMRgu5vRmlegcuoKwlI6kklHodbh1GUejfEfw== X-Received: by 2002:adf:9e0c:: with SMTP id u12mr10922351wre.216.1550344325152; Sat, 16 Feb 2019 11:12:05 -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 m21sm16432236wmi.43.2019.02.16.11.12.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Feb 2019 11:12:04 -0800 (PST) Subject: [PATCH 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: <8945c224-bfff-294d-f855-979016e077ec@gmail.com> Message-ID: <981d58bb-3300-d161-1d9f-992ba2393123@gmail.com> Date: Sat, 16 Feb 2019 20:11:47 +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: <8945c224-bfff-294d-f855-979016e077ec@gmail.com> 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