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 0C0FEC282C2 for ; Sun, 10 Feb 2019 19:00:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CC7CC20873 for ; Sun, 10 Feb 2019 19:00:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IlxWDRyQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726892AbfBJTAS (ORCPT ); Sun, 10 Feb 2019 14:00:18 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:37805 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726035AbfBJTAR (ORCPT ); Sun, 10 Feb 2019 14:00:17 -0500 Received: by mail-wm1-f68.google.com with SMTP id x10so7433638wmg.2 for ; Sun, 10 Feb 2019 11:00:15 -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=oMsJGlmcBtAB8zTtAKxElOJx2UMnDn10DWbann4+6Rk=; b=IlxWDRyQs/+5IyuINr2dTeX2wYpCbYRLWIOa3cqf32WDvzvZB5IAYmOnV5lB4OFktT daO+SWXVdXiR37QBFapVclizR2BciAC8OW36rsZi97n8YxPFdeeSzqLzluSkrE8c0U6t BjUbqi4xCIVyomSIqamfO+grtZih4Ip+waEJ4CrZ+Wtkuj1jkg3JCko6KGtfG90SR4d0 n8+lnZXlMZuMz6An5AGnj82eO/YStMCz8GCQZz/AkXVrtXAjfKEvMLKZmDGcgY/QuVHn KuOdWtRhAZaT11pU6GitWjZ+ipvnUokuZpyLZfoK5sBUvVT5DVAGuQyVTzVnT4+0osyc BQIw== 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=oMsJGlmcBtAB8zTtAKxElOJx2UMnDn10DWbann4+6Rk=; b=MUwy9P0pZLfLzR3aC0+hBRs9ThZQXtOFPUsDQq/DZ77b8iZjV6tPoLt3BHXkXDehnR Tc5bHmmHjJ4aLnFr5w4KSEOcV4HOX8itqwB3cR0ROBOn07UIweCHvEM5jR1HqXQvMDks 7aV462F85yvgOsM+pRylRScj2zDLq9G1bP6zp+1mpSLkemshKMg3HdINUxgn3i9AzqvX cZF2o/KLARu3ju/oexRsfC9gAEFDbWbeNSZnvJirbIbIfRXpwhFO/LRM9IajPEk8N+p4 qN4EfoAUqd03bnkvbudF3oIBaMV2QXNotEtJy/rA4jPYJ81eyW7Q+bV9/0NZl2sFwgLZ XaYQ== X-Gm-Message-State: AHQUAuYc2L7MWxJW0RvLYItwV7lDVO6SuKdIGBk1+FLolq8vAtFPbR+C rQkY1MyGAED5KZd+AlwCBZm+SkGt X-Google-Smtp-Source: AHgI3IbeIuu1J1KIKwQ9mWR8hIVXcKP475nIFDgJ3EmsYjra6hPqILhccy0L05pRRobXfJuFcmnCrg== X-Received: by 2002:a05:600c:220b:: with SMTP id z11mr6320214wml.37.1549825214702; Sun, 10 Feb 2019 11:00:14 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:417c:8049:705f:3547? (p200300EA8BF1E200417C8049705F3547.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:417c:8049:705f:3547]) by smtp.googlemail.com with ESMTPSA id v9sm5774912wrt.82.2019.02.10.11.00.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Feb 2019 11:00:14 -0800 (PST) Subject: [PATCH net-next 3/3] net: phy: use phy_modify_changed in genphy_config_advert From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" References: Message-ID: Date: Sun, 10 Feb 2019 19:59:57 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.5.0 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 Use phy_modify_changed() to simplify the code. Signed-off-by: Heiner Kallweit --- drivers/net/phy/phy_device.c | 43 +++++++++++++----------------------- 1 file changed, 15 insertions(+), 28 deletions(-) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 8573d17ec..3d14e48ae 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1516,7 +1516,7 @@ EXPORT_SYMBOL(phy_reset_after_clk_enable); static int genphy_config_advert(struct phy_device *phydev) { u32 advertise; - int oldadv, adv, bmsr; + int bmsr, adv; int err, changed = 0; /* Only allow advertising what this PHY supports */ @@ -1529,22 +1529,14 @@ static int genphy_config_advert(struct phy_device *phydev) phydev->advertising); /* Setup standard advertisement */ - adv = phy_read(phydev, MII_ADVERTISE); - if (adv < 0) - return adv; - - oldadv = adv; - adv &= ~(ADVERTISE_ALL | ADVERTISE_100BASE4 | ADVERTISE_PAUSE_CAP | - ADVERTISE_PAUSE_ASYM); - adv |= ethtool_adv_to_mii_adv_t(advertise); - - if (adv != oldadv) { - err = phy_write(phydev, MII_ADVERTISE, adv); - - if (err < 0) - return err; + err = phy_modify_changed(phydev, MII_ADVERTISE, + ADVERTISE_ALL | ADVERTISE_100BASE4 | + ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM, + ethtool_adv_to_mii_adv_t(advertise)); + if (err < 0) + return err; + if (err > 0) changed = 1; - } bmsr = phy_read(phydev, MII_BMSR); if (bmsr < 0) @@ -1558,25 +1550,20 @@ static int genphy_config_advert(struct phy_device *phydev) return changed; /* Configure gigabit if it's supported */ - adv = phy_read(phydev, MII_CTRL1000); - if (adv < 0) - return adv; - - oldadv = adv; - adv &= ~(ADVERTISE_1000FULL | ADVERTISE_1000HALF); - + adv = 0; if (linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT, phydev->supported) || linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, phydev->supported)) - adv |= ethtool_adv_to_mii_ctrl1000_t(advertise); + adv = ethtool_adv_to_mii_ctrl1000_t(advertise); - if (adv != oldadv) - changed = 1; - - err = phy_write(phydev, MII_CTRL1000, adv); + err = phy_modify_changed(phydev, MII_CTRL1000, + ADVERTISE_1000FULL | ADVERTISE_1000HALF, + adv); if (err < 0) return err; + if (err > 0) + changed = 1; return changed; } -- 2.20.1