From patchwork Wed Jul 11 20:30:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 942699 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="iCf/yZhK"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41QrMc0Y57z9s01 for ; Thu, 12 Jul 2018 06:31:55 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389074AbeGKUhz (ORCPT ); Wed, 11 Jul 2018 16:37:55 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:40350 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732425AbeGKUhz (ORCPT ); Wed, 11 Jul 2018 16:37:55 -0400 Received: by mail-wm0-f66.google.com with SMTP id z13-v6so3803757wma.5 for ; Wed, 11 Jul 2018 13:31:51 -0700 (PDT) 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=4lIzqZc0jSkLmBxcw+MC+zGkbMlCjQkvI6uOnKAqLBs=; b=iCf/yZhKdsxDiyyUN866oi/YJPoFYROFw4Rgjlql/FIsy48JuGPGv2/3rhvO1kCgWs 8PiZkwJuHRLv/Syb3k2OjmwLlWhaKdGuDw9typpq5i5HJbCV4Szb/iOYrbMgN3qzxkyI GEWdykHzwFcVdWJSNxqt6UV33nnKybCqSTm7CP1NFL5UPNvks0my8OKHr7KYLuwzDQ+f /JX1CoJZVHqBHVEzXGfFBz6zNhVjkmE5wnvKiwJjIRVkWqY8TMQAFUNay8hadM/9+AQN /CamgRhyuYpYpYV1CnynGRIJWRDPYPdyCCvyU+naQH+iUuAytSNSe8apwRV/Oz06CGNW hZKg== 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=4lIzqZc0jSkLmBxcw+MC+zGkbMlCjQkvI6uOnKAqLBs=; b=Mk2PzFTSWMIlQ/0E8+XMzfr5+niVKr58S4Mawr6qQ31Wp/Buu87YW/emXhzfx1qa66 v8tCXurz/cRBCpP42WdYvWlun1QB/l0bEeLcUtS0ihPj5q6JmXYa2sJur2MwQkSif0ki hyuVkI0nAwQKhlqR4/vflXL0nvzt520vlAcYqeVfB6XETpWUB7UBMKqur8Va8aCjUlQz Yf6Wsvg3Lrd/+E+XVkSp8u+F5xsj6G0koPUCrstxpQme7B/LXTV7eLOc7Zdc8KRZK409 rcxybIxDj7oAUEM7HoQtey+1RYUBjFLmbLNS0lVCcS7wjlXX8MrQeYgaF8IDfeM1scqA Nj4w== X-Gm-Message-State: AOUpUlFWAhGtubDVvjudrV1Xfc75DbMW6t3wKmNQXsoI/aH/mNDpKxm5 Lwp8i2kyKS9lZFFmTbASRCfVhg== X-Google-Smtp-Source: AAOMgpd4jFW2zUtetopOH1IM5dX/lbZU5lLY5/VMyZ7k3ybbpel+2c2MC7kTn2ZdykmU41uiA4P84g== X-Received: by 2002:a1c:9042:: with SMTP id s63-v6mr27507wmd.91.1531341110727; Wed, 11 Jul 2018 13:31:50 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:d600:515e:2bda:3457:11f2? (p200300EA8BD4D600515E2BDA345711F2.dip0.t-ipconnect.de. [2003:ea:8bd4:d600:515e:2bda:3457:11f2]) by smtp.googlemail.com with ESMTPSA id o4-v6sm3621841wmo.20.2018.07.11.13.31.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Jul 2018 13:31:50 -0700 (PDT) Subject: [PATCH net-next 1/2] net: phy: add helper phy_config_aneg From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" References: <0d031081-4a7f-ddde-87c0-2c1c6be543c3@gmail.com> Message-ID: Date: Wed, 11 Jul 2018 22:30:27 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 In-Reply-To: <0d031081-4a7f-ddde-87c0-2c1c6be543c3@gmail.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This functionality will also be needed in subsequent patches of this series, therefore factor it out to a helper. Signed-off-by: Heiner Kallweit Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli --- drivers/net/phy/phy.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 537297d2..c4aa360d 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -467,6 +467,14 @@ int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd) } EXPORT_SYMBOL(phy_mii_ioctl); +static int phy_config_aneg(struct phy_device *phydev) +{ + if (phydev->drv->config_aneg) + return phydev->drv->config_aneg(phydev); + else + return genphy_config_aneg(phydev); +} + /** * phy_start_aneg_priv - start auto-negotiation for this PHY device * @phydev: the phy_device struct @@ -493,10 +501,7 @@ static int phy_start_aneg_priv(struct phy_device *phydev, bool sync) /* Invalidate LP advertising flags */ phydev->lp_advertising = 0; - if (phydev->drv->config_aneg) - err = phydev->drv->config_aneg(phydev); - else - err = genphy_config_aneg(phydev); + err = phy_config_aneg(phydev); if (err < 0) goto out_unlock;