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 1AD93C282CC for ; Sun, 10 Feb 2019 19:00:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DD29620873 for ; Sun, 10 Feb 2019 19:00:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RDJc5win" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727002AbfBJTAS (ORCPT ); Sun, 10 Feb 2019 14:00:18 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:34199 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726127AbfBJTAP (ORCPT ); Sun, 10 Feb 2019 14:00:15 -0500 Received: by mail-wm1-f66.google.com with SMTP id y185so12334434wmd.1 for ; Sun, 10 Feb 2019 11:00:14 -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=k3ZvB4+tOqMMbV+7mivjFuPvSKjL9cOZfJTuDa1TkzY=; b=RDJc5win4LAHX//j0qRh95OJGbctDOORXV7pVFKa4nlr0ATyR0y38aVjadd30fx1c2 ltfwfVWrqvrkJRAOTBZETbFvQ1b7X7bJprx895rYLRqomiKw4ltqpaFejhbvKXVtUyr+ BupW5XfRBGtUgpg8PauC+WithtOOWn3dNh7V64m+kagI24Io18g5uqMHVkxYlPCqlw1T ym7ew9Dy5jUtfZ0qdEw1ayTdsc6gOlFoyIiU+1vcroFqu19VPBrpC38mYNfxZHDeO1QW RHgWDsHuwi0/UrWS02tv9qOc16/VWepnJI3aVZI2xboD7y3xTnzk2/twVPzT6eoLG0CN ovVg== 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=k3ZvB4+tOqMMbV+7mivjFuPvSKjL9cOZfJTuDa1TkzY=; b=OlFCLKQ81SAyuz37Yhwvyt/2SQYWMs2X0pi7p+G+MyfS91NE462Q2Kca35BTM+80PM CGCvOojSFQj/BJ1ikPLjh7Pv80HxHBtOAGAh3+Kez1WwDPi/cVlNUKyiFIaNTJSiF5K4 ZhwJP6r7Yh5mJlzaGZIZohnvWigzUSaxjgQfSLYwmpn1+yRw5TLkiu5EQ3DStUR+qWX9 dmpdQF5C0h+1z9h6iUOxMnm5lyjVnLxPaEvVJ3DIG3Rr6hOyjgbUJiKtOW4h5r4w1UdM ANK4+r40Y5s7Eeu1Pu2DuRHtLZd9fPPSfiuDbLXHgRGaXmLB3Vb0h/iIt5LDPg+59LaD rAHA== X-Gm-Message-State: AHQUAuZJKIbA1VtP4Fg4ZH+3df/b7syQNJAnvhcGFXnTqK6Aux5mz4PV qVu6qDLqIAvhx8Qy84JhAajmxAgq X-Google-Smtp-Source: AHgI3Iby+uG0HUOfdxJIHa4FrqeQtBWzkJ4BIkOm3/fZnKuKu6e+1945zz8A+4kzotYhc/U4QMckTA== X-Received: by 2002:a7b:c0c5:: with SMTP id s5mr6240767wmh.56.1549825213142; Sun, 10 Feb 2019 11:00:13 -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 q8sm15622805wrr.9.2019.02.10.11.00.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Feb 2019 11:00:12 -0800 (PST) Subject: [PATCH net-next 2/3] net: phy: marvell10g: fix usage of new MMD modifying helpers From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" References: Message-ID: Date: Sun, 10 Feb 2019 19:58:49 +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 When replacing mv3310_modify() with phy_modify_mmd() we missed that they behave differently, mv3310_modify() returns 1 on a changed register value whilst phy_modify_mmd() returns 0. Fix this by replacing phy_modify_mmd() with phy_modify_mmd_changed() where needed. Fixes: b52c018ddccf ("net: phy: make use of new MMD accessors") Signed-off-by: Heiner Kallweit --- drivers/net/phy/marvell10g.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c index 96a79c6c7..08362dc65 100644 --- a/drivers/net/phy/marvell10g.c +++ b/drivers/net/phy/marvell10g.c @@ -141,10 +141,9 @@ static int mv3310_hwmon_config(struct phy_device *phydev, bool enable) return ret; val = enable ? MV_V2_TEMP_CTRL_SAMPLE : MV_V2_TEMP_CTRL_DISABLE; - ret = phy_modify_mmd(phydev, MDIO_MMD_VEND2, MV_V2_TEMP_CTRL, - MV_V2_TEMP_CTRL_MASK, val); - return ret < 0 ? ret : 0; + return phy_modify_mmd(phydev, MDIO_MMD_VEND2, MV_V2_TEMP_CTRL, + MV_V2_TEMP_CTRL_MASK, val); } static void mv3310_hwmon_disable(void *data) @@ -345,7 +344,7 @@ static int mv3310_config_aneg(struct phy_device *phydev) linkmode_and(phydev->advertising, phydev->advertising, phydev->supported); - ret = phy_modify_mmd(phydev, MDIO_MMD_AN, MDIO_AN_ADVERTISE, + ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN, MDIO_AN_ADVERTISE, ADVERTISE_ALL | ADVERTISE_100BASE4 | ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM, linkmode_adv_to_mii_adv_t(phydev->advertising)); @@ -355,7 +354,7 @@ static int mv3310_config_aneg(struct phy_device *phydev) changed = true; reg = linkmode_adv_to_mii_ctrl1000_t(phydev->advertising); - ret = phy_modify_mmd(phydev, MDIO_MMD_AN, MV_AN_CTRL1000, + ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN, MV_AN_CTRL1000, ADVERTISE_1000FULL | ADVERTISE_1000HALF, reg); if (ret < 0) return ret; @@ -369,8 +368,8 @@ static int mv3310_config_aneg(struct phy_device *phydev) else reg = 0; - ret = phy_modify_mmd(phydev, MDIO_MMD_AN, MDIO_AN_10GBT_CTRL, - MDIO_AN_10GBT_CTRL_ADV10G, reg); + ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN, MDIO_AN_10GBT_CTRL, + MDIO_AN_10GBT_CTRL_ADV10G, reg); if (ret < 0) return ret; if (ret > 0) -- 2.20.1