From patchwork Sat Mar 23 13:35:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1062230 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="og33ZXJj"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44RM3R6RzZz9sSM for ; Sun, 24 Mar 2019 00:35:31 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727463AbfCWNf3 (ORCPT ); Sat, 23 Mar 2019 09:35:29 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:39739 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726909AbfCWNf3 (ORCPT ); Sat, 23 Mar 2019 09:35:29 -0400 Received: by mail-wr1-f67.google.com with SMTP id j9so5228900wrn.6 for ; Sat, 23 Mar 2019 06:35:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=Edh5RITQMjbYGrFJiPrGLPVZZBY9hmPCuEaer3qJKtM=; b=og33ZXJjECf4rJbqggkdsrqYmFKDMrZ4v2G4FxOmaL9lRmhtsLO2oY6PmEtQZ1Yqvf N4x829wz8SOCstqI5tEKAVyh5sVAv7DsYdQFkJbBEs18kpt6Z9CV/uEbvlf9eu7UpdeD vwzfhyIsufmjpJTFySgXAToB4OgWU7X0h8W79iPUagFsfEoyQsAX1syZtx+V2zp9WhQ0 CA/b/Db81mPF8G8uMVsBTiDFWi1ao0/mCjLNQ6GasNg4TxtrGbTLYQ5NSgZ6FwGCWFfK /5ROBbdCpuu45WR9O9ozBYKznrEa66Kaz93lqz3oCI5pGMkZELOsfJKDfvngoQIKkUe2 w9Ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=Edh5RITQMjbYGrFJiPrGLPVZZBY9hmPCuEaer3qJKtM=; b=sGQVD78RMZL7M3nQQDbTjo/+x30jUsuaN6K4BL2O0+GnybbEMtonyl0oavusuvRqrj e5MARyGWASCRMjZU0986mvkD1i/1Mr6U6wTldduLAzCS2vn3KklLv6QtISpxs/ae37Ya gDNNe6vVCWnwhn83OT2GSU8tMttaGZlKpqNTJUHG6Ug2LC5ygE5x5GDTySb+LiGwLYEs V2qLgIcC5KLgMwVVib7Z2PDe/fM9cgZULgzBKwuLSrSEVN9QKuopn5j1ecYfHoVr6wOQ XZE+icpk58Y5hDhZQFiTQQuiP+06JaXYhp0f33FyVOFZsxDinRaC7IC0sEm4s9oCjUv6 JrFg== X-Gm-Message-State: APjAAAUJruWR9AjG8HEolnjIeCs8fVaQ4RLSNNIAMvRJ/SV0M45fiw2y /pZk0gGrfGpqYC+MLJfSxVZHPjwY X-Google-Smtp-Source: APXvYqyl1ApVnoLLvyUu0tqsfx3w5gTRZ7EGULtWsMmM5kXYqXyGTd/lUnpQNU55D4tdTPlFaElrbg== X-Received: by 2002:adf:e9c1:: with SMTP id l1mr9502257wrn.270.1553348127468; Sat, 23 Mar 2019 06:35:27 -0700 (PDT) Received: from ?IPv6:2003:ea:8bc4:dc00:49b3:4cd3:4cd9:effe? (p200300EA8BC4DC0049B34CD34CD9EFFE.dip0.t-ipconnect.de. [2003:ea:8bc4:dc00:49b3:4cd3:4cd9:effe]) by smtp.googlemail.com with ESMTPSA id x17sm23897257wrd.95.2019.03.23.06.35.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Mar 2019 06:35:26 -0700 (PDT) To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" From: Heiner Kallweit Subject: [PATCH net-next] net: phy: aquantia: simplify aqr_config_aneg Message-ID: <12d483e9-0fdb-10ad-370f-470af71eb9a0@gmail.com> Date: Sat, 23 Mar 2019 14:35:20 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.0 MIME-Version: 1.0 Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Simplify aqr_config_aneg(). Signed-off-by: Heiner Kallweit --- drivers/net/phy/aquantia_main.c | 45 ++++++++++----------------------- 1 file changed, 13 insertions(+), 32 deletions(-) diff --git a/drivers/net/phy/aquantia_main.c b/drivers/net/phy/aquantia_main.c index 1013711e1..37032f3ba 100644 --- a/drivers/net/phy/aquantia_main.c +++ b/drivers/net/phy/aquantia_main.c @@ -148,41 +148,22 @@ static int aqr_config_aneg(struct phy_device *phydev) static int aqr_config_intr(struct phy_device *phydev) { + bool en = phydev->interrupts == PHY_INTERRUPT_ENABLED; int err; - if (phydev->interrupts == PHY_INTERRUPT_ENABLED) { - err = phy_write_mmd(phydev, MDIO_MMD_AN, - MDIO_AN_TX_VEND_INT_MASK2, - MDIO_AN_TX_VEND_INT_MASK2_LINK); - if (err < 0) - return err; - - err = phy_write_mmd(phydev, MDIO_MMD_VEND1, - VEND1_GLOBAL_INT_STD_MASK, - VEND1_GLOBAL_INT_STD_MASK_ALL); - if (err < 0) - return err; - - err = phy_write_mmd(phydev, MDIO_MMD_VEND1, - VEND1_GLOBAL_INT_VEND_MASK, - VEND1_GLOBAL_INT_VEND_MASK_GLOBAL3 | - VEND1_GLOBAL_INT_VEND_MASK_AN); - } else { - err = phy_write_mmd(phydev, MDIO_MMD_AN, - MDIO_AN_TX_VEND_INT_MASK2, 0); - if (err < 0) - return err; - - err = phy_write_mmd(phydev, MDIO_MMD_VEND1, - VEND1_GLOBAL_INT_STD_MASK, 0); - if (err < 0) - return err; - - err = phy_write_mmd(phydev, MDIO_MMD_VEND1, - VEND1_GLOBAL_INT_VEND_MASK, 0); - } + err = phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_TX_VEND_INT_MASK2, + en ? MDIO_AN_TX_VEND_INT_MASK2_LINK : 0); + if (err < 0) + return err; + + err = phy_write_mmd(phydev, MDIO_MMD_VEND1, VEND1_GLOBAL_INT_STD_MASK, + en ? VEND1_GLOBAL_INT_STD_MASK_ALL : 0); + if (err < 0) + return err; - return err; + return phy_write_mmd(phydev, MDIO_MMD_VEND1, VEND1_GLOBAL_INT_VEND_MASK, + en ? VEND1_GLOBAL_INT_VEND_MASK_GLOBAL3 | + VEND1_GLOBAL_INT_VEND_MASK_AN : 0); } static int aqr_ack_interrupt(struct phy_device *phydev)