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=-7.1 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 83EC0C43381 for ; Sat, 2 Mar 2019 16:16:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4F14920836 for ; Sat, 2 Mar 2019 16:16:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FVmEcGmz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726477AbfCBQQR (ORCPT ); Sat, 2 Mar 2019 11:16:17 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:44201 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726282AbfCBQQQ (ORCPT ); Sat, 2 Mar 2019 11:16:16 -0500 Received: by mail-wr1-f67.google.com with SMTP id w2so979371wrt.11 for ; Sat, 02 Mar 2019 08:16:16 -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=491fUHAIDY9ucTtiJ5A7UxtzTJHGzPJFyYOkiq3gRow=; b=FVmEcGmzRUoqt7YZ1sZH24pNEyoqjpel4NgWi30we2lnGyfK5YOD96TirtHnvgnco6 ztCG5qEuPx79CP6qTUlKICSP0OdEM03LLTdlQ0e9uG6zI8MomEizhSB6H+te7zpkk/rr bw6DUB39KzcdyAldvVlHCQHNxUaxvz6bngzsr455Pu715vBetF3ALvPbMRp8+xWn9gvi sJ5BIaOC1/8QVBtMfQlWwjNpzhiKH2P30slE6yXNYehnwaNyg57lqB6Bhn8rGOXq/eFA vzb7Pe5n1O/YN/6SvdK9mLN0lY7wf2k+n+KHNQZeRugrI8QM8uOHmZW7CPWSqrjAnOvc mm2A== 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=491fUHAIDY9ucTtiJ5A7UxtzTJHGzPJFyYOkiq3gRow=; b=gfxdQBoJmyJmiTQrgMg8H1mBxFIO1rjoYOW0lGReSGgLgpJU9jaiJ3UrGgKuyZJL9U DtUBsUIkWEGE80ZJsrWxmqRNxGW2iZTDQrkc9XwE5kv+GQVObFQgHjEWDfYDdWRajZ3n 6Is8PUJUO+gLrP/D67MmcsNWuRAqj/oEiW3MFjNYFy51xFv2bZAYrTJR7JvAPS76yXBs Wv9e6WctNQWg2NRpyytsCvUOGUGGsN7bKSmDYfonI9LdkMta17Ciivv94+1OlTHACWBq 44yQFv2gG5oQQCWud+KW7WCyOp8z+rkEHZMm+aYJcM1qtxC5/V12NLXHrdwMvaId875i UG6A== X-Gm-Message-State: APjAAAXXZQQ3IiKqAr2kSdVQcRT3eHkfVW/YLg/rfZslD/kq45d6RUEG Sf71gSWn+Uyg1MNa4Z481X+02rWu X-Google-Smtp-Source: APXvYqynfxs8hLX8lAHaIGSTdvAErl99Y4NdYyMjyJTNgCQMUX8M4CmFq/9TQEAjQuG5Rk9cP3hsUQ== X-Received: by 2002:adf:de83:: with SMTP id w3mr6967965wrl.56.1551543375058; Sat, 02 Mar 2019 08:16:15 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:ed04:ce8:ead3:a1ec? (p200300EA8BF1E200ED040CE8EAD3A1EC.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:ed04:ce8:ead3:a1ec]) by smtp.googlemail.com with ESMTPSA id a8sm3889096wmh.26.2019.03.02.08.16.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 02 Mar 2019 08:16:14 -0800 (PST) Subject: [PATCH net-next 1/5] net: phy: use genphy_c45_aneg_done in genphy_aneg_done From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" References: <7c0ef5fe-2f4f-d365-a028-d96179e9fab4@gmail.com> Message-ID: <4ab446fb-ab77-8dbd-0fed-b8f0bb1ca270@gmail.com> Date: Sat, 2 Mar 2019 17:10:00 +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: <7c0ef5fe-2f4f-d365-a028-d96179e9fab4@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 we have it let's use genphy_c45_aneg_done() in phy_aneg_done(). Signed-off-by: Heiner Kallweit --- drivers/net/phy/phy.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 69dc64a4d..3745220c5 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -144,14 +144,10 @@ int phy_aneg_done(struct phy_device *phydev) { if (phydev->drv && phydev->drv->aneg_done) return phydev->drv->aneg_done(phydev); - - /* Avoid genphy_aneg_done() if the Clause 45 PHY does not - * implement Clause 22 registers - */ - if (phydev->is_c45 && !(phydev->c45_ids.devices_in_package & BIT(0))) - return -EINVAL; - - return genphy_aneg_done(phydev); + else if (phydev->is_c45) + return genphy_c45_aneg_done(phydev); + else + return genphy_aneg_done(phydev); } EXPORT_SYMBOL(phy_aneg_done); -- 2.21.0