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=-6.8 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 DA431C43381 for ; Wed, 27 Mar 2019 21:00:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9DA0A2075E for ; Wed, 27 Mar 2019 21:00:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YGAbaVyg" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728197AbfC0VAv (ORCPT ); Wed, 27 Mar 2019 17:00:51 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:39918 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727617AbfC0VAu (ORCPT ); Wed, 27 Mar 2019 17:00:50 -0400 Received: by mail-wm1-f67.google.com with SMTP id t124so1559525wma.4 for ; Wed, 27 Mar 2019 14:00:48 -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=V1I9sYzKdc5q++h6TYctvtellKTP4qhxK9dTznhdWWw=; b=YGAbaVyghjb54TlyDWTRJkuorD17kxef+GicHs9lM49Hc5m8nIGcoyyqGgkNDNViJ3 tNa/VeNlLmS6uRrY6M6IRYOcyznnBUTMSfCP7gSJAzvoCULNyBBPyT7/KSrnOHtMJ6Q8 YHPxGj8cIcoqNGhlyCFGQmcYdVn0DbfLPuqRNjQJkzGdY8y1ro8L8PmxtTIuwieAiEY/ WqTDSfiSw47BJBGDzWzwm18Gv20vgslrd6+sxeMd/5NOoVVQ8tlyCVylqwNcae+Lw49v O3qCIQRml6Q268Ws9DgqNQYA1A7yJOEKRow6PTuGbgRjPcVSz9inDuLGjMV7uLmXBlJZ cQKA== 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=V1I9sYzKdc5q++h6TYctvtellKTP4qhxK9dTznhdWWw=; b=bA7N2zG0ZSevHfm9uYds74hiaHk3GLtk8jk/r5ipvBpKQSQWzDj78va97sY1ezGWHe tcU2UcA5dCWAb6TMzJxBQ9/bpWJ0ALuesSDp/QxjceIYYwyKxg1ssOgltqqxdX3hScW6 Khcs3j0UP+jeQzYAJ998Fmdds+dEqaZr5Z98dy/Xu4Mel7z3VCUC1bOBB9VSfpesPzYE U+7z2o7xBfKi2G2iyVBBJ4whFMfcsYIMymxpuppFpXSt5sEsxFk77L3RBR+yp6r0/2+8 i2wJpfPhBC37PUQKD8eYnXM4vwbn81xkv1m9xICUJ34yC/hnc6jQ3yfe57vmOepHSYkI J86w== X-Gm-Message-State: APjAAAUwMN1R5ANZIOzt41y5Ejtx+3A22lm2uCZaeafp7CkzXx0wW68I uaAqicyIwugFXrWX6OH+qNonCeJX X-Google-Smtp-Source: APXvYqyXHv2ohvL7nwoYdpPwloGuYP+L7W4905yOcuJaJVtqbuV6oLqNv9CtGQ7ISUpE2GQoRCRtEA== X-Received: by 2002:a1c:7d42:: with SMTP id y63mr3821046wmc.113.1553720447581; Wed, 27 Mar 2019 14:00:47 -0700 (PDT) Received: from ?IPv6:2003:ea:8bc4:dc00:ccf1:55bc:aa83:b190? (p200300EA8BC4DC00CCF155BCAA83B190.dip0.t-ipconnect.de. [2003:ea:8bc4:dc00:ccf1:55bc:aa83:b190]) by smtp.googlemail.com with ESMTPSA id f15sm17347752wru.21.2019.03.27.14.00.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 14:00:47 -0700 (PDT) Subject: [PATCH net-next 3/3] net: phy: realtek: use genphy_read_abilities From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" References: <3d087449-a68f-8233-e97f-29038f8de29a@gmail.com> Message-ID: <6f6b620c-f109-43b9-f39a-6c4970386da9@gmail.com> Date: Wed, 27 Mar 2019 22:00:32 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <3d087449-a68f-8233-e97f-29038f8de29a@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 Use new function genphy_read_abilities(). This allows to remove all calls to genphy_config_init(). Signed-off-by: Heiner Kallweit --- drivers/net/phy/realtek.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c index 10df52ccd..5ecbd41ed 100644 --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c @@ -151,21 +151,14 @@ static int rtl8211_config_aneg(struct phy_device *phydev) static int rtl8211c_config_init(struct phy_device *phydev) { /* RTL8211C has an issue when operating in Gigabit slave mode */ - phy_set_bits(phydev, MII_CTRL1000, - CTL1000_ENABLE_MASTER | CTL1000_AS_MASTER); - - return genphy_config_init(phydev); + return phy_set_bits(phydev, MII_CTRL1000, + CTL1000_ENABLE_MASTER | CTL1000_AS_MASTER); } static int rtl8211f_config_init(struct phy_device *phydev) { - int ret; u16 val = 0; - ret = genphy_config_init(phydev); - if (ret < 0) - return ret; - /* enable TX-delay for rgmii-id and rgmii-txid, otherwise disable it */ if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID || phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID) @@ -192,10 +185,6 @@ static int rtl8366rb_config_init(struct phy_device *phydev) { int ret; - ret = genphy_config_init(phydev); - if (ret < 0) - return ret; - ret = phy_set_bits(phydev, RTL8366RB_POWER_SAVE, RTL8366RB_POWER_SAVE_ON); if (ret) { @@ -210,11 +199,11 @@ static struct phy_driver realtek_drvs[] = { { PHY_ID_MATCH_EXACT(0x00008201), .name = "RTL8201CP Ethernet", - .features = PHY_BASIC_FEATURES, + .get_features = genphy_read_abilities, }, { PHY_ID_MATCH_EXACT(0x001cc816), .name = "RTL8201F Fast Ethernet", - .features = PHY_BASIC_FEATURES, + .get_features = genphy_read_abilities, .ack_interrupt = &rtl8201_ack_interrupt, .config_intr = &rtl8201_config_intr, .suspend = genphy_suspend, @@ -224,14 +213,14 @@ static struct phy_driver realtek_drvs[] = { }, { PHY_ID_MATCH_EXACT(0x001cc910), .name = "RTL8211 Gigabit Ethernet", - .features = PHY_GBIT_FEATURES, + .get_features = genphy_read_abilities, .config_aneg = rtl8211_config_aneg, .read_mmd = &genphy_read_mmd_unsupported, .write_mmd = &genphy_write_mmd_unsupported, }, { PHY_ID_MATCH_EXACT(0x001cc912), .name = "RTL8211B Gigabit Ethernet", - .features = PHY_GBIT_FEATURES, + .get_features = genphy_read_abilities, .ack_interrupt = &rtl821x_ack_interrupt, .config_intr = &rtl8211b_config_intr, .read_mmd = &genphy_read_mmd_unsupported, @@ -241,14 +230,14 @@ static struct phy_driver realtek_drvs[] = { }, { PHY_ID_MATCH_EXACT(0x001cc913), .name = "RTL8211C Gigabit Ethernet", - .features = PHY_GBIT_FEATURES, + .get_features = genphy_read_abilities, .config_init = rtl8211c_config_init, .read_mmd = &genphy_read_mmd_unsupported, .write_mmd = &genphy_write_mmd_unsupported, }, { PHY_ID_MATCH_EXACT(0x001cc914), .name = "RTL8211DN Gigabit Ethernet", - .features = PHY_GBIT_FEATURES, + .get_features = genphy_read_abilities, .ack_interrupt = rtl821x_ack_interrupt, .config_intr = rtl8211e_config_intr, .suspend = genphy_suspend, @@ -256,7 +245,7 @@ static struct phy_driver realtek_drvs[] = { }, { PHY_ID_MATCH_EXACT(0x001cc915), .name = "RTL8211E Gigabit Ethernet", - .features = PHY_GBIT_FEATURES, + .get_features = genphy_read_abilities, .ack_interrupt = &rtl821x_ack_interrupt, .config_intr = &rtl8211e_config_intr, .suspend = genphy_suspend, @@ -264,7 +253,7 @@ static struct phy_driver realtek_drvs[] = { }, { PHY_ID_MATCH_EXACT(0x001cc916), .name = "RTL8211F Gigabit Ethernet", - .features = PHY_GBIT_FEATURES, + .get_features = genphy_read_abilities, .config_init = &rtl8211f_config_init, .ack_interrupt = &rtl8211f_ack_interrupt, .config_intr = &rtl8211f_config_intr, @@ -275,8 +264,7 @@ static struct phy_driver realtek_drvs[] = { }, { PHY_ID_MATCH_EXACT(0x001cc800), .name = "Generic Realtek PHY", - .features = PHY_GBIT_FEATURES, - .config_init = genphy_config_init, + .get_features = genphy_read_abilities, .suspend = genphy_suspend, .resume = genphy_resume, .read_page = rtl821x_read_page, @@ -284,7 +272,7 @@ static struct phy_driver realtek_drvs[] = { }, { PHY_ID_MATCH_EXACT(0x001cc961), .name = "RTL8366RB Gigabit Ethernet", - .features = PHY_GBIT_FEATURES, + .get_features = genphy_read_abilities, .config_init = &rtl8366rb_config_init, /* These interrupts are handled by the irq controller * embedded inside the RTL8366RB, they get unmasked when the -- 2.21.0