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 B9498C43381 for ; Mon, 18 Feb 2019 20:28:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 86B30204EC for ; Mon, 18 Feb 2019 20:28:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="b3m+D+Ux" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729496AbfBRU2G (ORCPT ); Mon, 18 Feb 2019 15:28:06 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:55042 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726953AbfBRU2F (ORCPT ); Mon, 18 Feb 2019 15:28:05 -0500 Received: by mail-wm1-f68.google.com with SMTP id a62so362117wmh.4 for ; Mon, 18 Feb 2019 12:28:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=DIF23K9jUIHW6Ea7QWAQPJ+otvdyZXDu48gi0bX8GRE=; b=b3m+D+UxmyNw6qh+9QV5gVxOeW8wisDoIrEgMNtV8DQSHqzhvut+y6msyNEhu90m9M /KOCRKed5iuYhUf+nkDNjCgy3Kd2OMHblgoor6uK8sx5nwt9wYNRQh+xk+hqUJRnwUab c7mdDR5QlzFWYESWTSfu4t0ERb2vNIFq1ucCujXHBKZVQLIg+PlLPFCts5vhfl1Cpx64 BwrMHCvW/egNW2xKNuwaC4ieycOYaixGV0LSCrbMcySxPUhtnUoyXhC4Sk9PATsrlb25 9PTWDi60DmXwLCPteO6JK56WvgPHWyYQNku6EZrWaFuKQogUiSN4rZBMWCXCKAN4sd+5 ZkKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=DIF23K9jUIHW6Ea7QWAQPJ+otvdyZXDu48gi0bX8GRE=; b=qEkELxPerx07zJxI/L+gNULp0Pn/4ozxx+DRZvbT/FIxlHxImVaRgF8fTKwh/WXs8n qOjQbP6q1gcS8TEP6js8iJpxl/AKyrdHN/zCoFFWJkqfCJfoqdJ2JzZUA1rYHabghayE mtmHCneunH1ujFM2/R4Ht39mvJUiMFw2H1KB+lVc1M2PzBJ8toIlgYr9f/j/vYajpQ+w qGSFARlSNpkSGqNYieWdxQvxz+2PFMBuVPGMAipboc3iARVYrXYFLsbyDbIcx8pdXXYS +Qtc/d1Mk3e39svYrqcTc0BSjoltCSZqW3L+1kvNIDdgZiiB6DaNQgmnZvzFkpptQOsT UziA== X-Gm-Message-State: AHQUAuZyPjVwLZWP7+m1wqox6S5B2STWMibKLY0gvxUgyANjgE5f2+0G 3nOHjdhP33mbLTvbUHeZyHbOc3GK X-Google-Smtp-Source: AHgI3IbwQHMofnFnaNCZRsryctaG014BrMv7WJ+F0LlzCaIwMYlYFdpJ6//RLWp+Hop4QekEUinxuA== X-Received: by 2002:a7b:c0c3:: with SMTP id s3mr346056wmh.141.1550521683244; Mon, 18 Feb 2019 12:28:03 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:71d7:c708:89b6:a86? (p200300EA8BF1E20071D7C70889B60A86.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:71d7:c708:89b6:a86]) by smtp.googlemail.com with ESMTPSA id v6sm25006027wrd.88.2019.02.18.12.28.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Feb 2019 12:28:02 -0800 (PST) From: Heiner Kallweit Subject: [PATCH net-next 4/4] net: phy: marvell10g: use genphy_c45_check_and_restart_aneg in mv3310_config_aneg To: Andrew Lunn , Florian Fainelli , David Miller , Russell King - ARM Linux Cc: "netdev@vger.kernel.org" References: <35d86611-9a07-7239-3310-767d8d1050b5@gmail.com> Message-ID: <8b7ab92a-7b87-2f50-08b0-d5923372668c@gmail.com> Date: Mon, 18 Feb 2019 21:27:46 +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: <35d86611-9a07-7239-3310-767d8d1050b5@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 Use new function genphy_c45_check_and_restart_aneg() to reduce boilerplate code. Signed-off-by: Heiner Kallweit --- drivers/net/phy/marvell10g.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c index 67066127b..8cbf35964 100644 --- a/drivers/net/phy/marvell10g.c +++ b/drivers/net/phy/marvell10g.c @@ -291,20 +291,7 @@ static int mv3310_config_aneg(struct phy_device *phydev) if (ret > 0) changed = true; - if (!changed) { - /* Configure and restart aneg if it wasn't set before */ - ret = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_CTRL1); - if (ret < 0) - return ret; - - if (!(ret & MDIO_AN_CTRL1_ENABLE)) - changed = 1; - } - - if (changed) - ret = genphy_c45_restart_aneg(phydev); - - return ret; + return genphy_c45_check_and_restart_aneg(phydev, changed); } static int mv3310_aneg_done(struct phy_device *phydev) -- 2.20.1