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 BA54DC4360F for ; Sat, 2 Mar 2019 16:16:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 891DD20863 for ; Sat, 2 Mar 2019 16:16:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dPW2oE8s" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726665AbfCBQQU (ORCPT ); Sat, 2 Mar 2019 11:16:20 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:46868 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726492AbfCBQQU (ORCPT ); Sat, 2 Mar 2019 11:16:20 -0500 Received: by mail-wr1-f67.google.com with SMTP id i16so971120wrs.13 for ; Sat, 02 Mar 2019 08:16:18 -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=ZoFPMCvgJK52Kf+FF/LwEetsuJgQ58xMIerp4j+vuxU=; b=dPW2oE8smvQE31RLBmWOBS58sphYPo1kP7G1tZwi2F0kA6GBJKb/9a07I70MNE8aL6 qBm1M0QcHvShF07Hw+gAIx9h4BTBleXa1j8ucfLK+FGx6aMyDAl1lCCVwvGlynaSiyxx WXWZtay3TXgHOn4vLbHZXoUCYa0XLet1UnmhQmcVdAb9lXM07zBQjZBRRtFXlxEz810n AVegDsgP64P8PiFUXwyC8QzgBYYWs7ROnCVV8o0rCa7u0gCQxHXBCo37zYz0IIKF/2zD oLiuwP4qa+y44uiDfPr2qOaRNC/Y6OHzmPmqDHlXp1z4e0h4Lo9lVsOah1YQXh99YrWc pzQQ== 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=ZoFPMCvgJK52Kf+FF/LwEetsuJgQ58xMIerp4j+vuxU=; b=ShBZWDhl5lUL59FoCXHwMEjU3Hm2avjl7w5AdRXaA+7NDk/JKN+xDdGGQ/X9Fo+2G7 rT8XpYqgwWrULf50AUkZ/9UouNjCg0ge14w6bLrWPb0R+qtHs7OkWqGAvkj1ZRgfI/A2 ctCd8oW2922dbzzSUCXuKElw8qD2DeRSiFsMt2KBvPvQSroB6FAtNTFlsx0qamm/Fm1g fa7iA6x6JA+Ru+iZFSw2ctlHc0nhVubDlYRYNj45HmhL2kf3yX0OXsStOD2DoO3m/tZv cKQjqPLo46hFLcKa80Dyp6rnH3RHbfj0r1jAUzMqNyilDFgmFvDwaJOI0gCusoSX7nvx IU7w== X-Gm-Message-State: APjAAAVvufrUtsMvlnTHoTRu7uA7jHTsuefb30OWWxkpteZilV+nALpU YYBYNgpP3F3OfUVW7ZjEoADpPUcQ X-Google-Smtp-Source: APXvYqwo2RWcmXVC5LTVCLXojZywC3ek7+AAiqceVPKU86C/Gse4pNdIDNxtg/u67+Krd1jIqGWZbA== X-Received: by 2002:adf:d08d:: with SMTP id y13mr6523074wrh.99.1551543378064; Sat, 02 Mar 2019 08:16:18 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:ed04:ce8:ead3:a1ec? (p200300EA8BF1E200ED040CE8EAD3A1EC.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:ed04:ce8:ead3:a1ec]) by smtp.googlemail.com with ESMTPSA id p5sm1186828wme.14.2019.03.02.08.16.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 02 Mar 2019 08:16:17 -0800 (PST) Subject: [PATCH net-next 3/5] net: phy: remove gen10g_config_init From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" References: <7c0ef5fe-2f4f-d365-a028-d96179e9fab4@gmail.com> Message-ID: <4f13b20c-25d9-beaa-3cdd-8533615e20aa@gmail.com> Date: Sat, 2 Mar 2019 17:11:40 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 In-Reply-To: <7c0ef5fe-2f4f-d365-a028-d96179e9fab4@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 ETHTOOL_LINK_MODE_10000baseT_Full_BIT is set anyway in the supported and advertising bitmap because it's part of PHY_10GBIT_FEATURES. And all users of gen10g_config_init use PHY_10GBIT_FEATURES. Signed-off-by: Heiner Kallweit --- drivers/net/phy/cortina.c | 1 - drivers/net/phy/phy-c45.c | 14 -------------- drivers/net/phy/teranetics.c | 1 - include/linux/phy.h | 1 - 4 files changed, 17 deletions(-) diff --git a/drivers/net/phy/cortina.c b/drivers/net/phy/cortina.c index c291dc014..a64eb211c 100644 --- a/drivers/net/phy/cortina.c +++ b/drivers/net/phy/cortina.c @@ -80,7 +80,6 @@ static struct phy_driver cortina_driver[] = { .phy_id_mask = 0xffffffff, .name = "Cortina CS4340", .features = PHY_10GBIT_FEATURES, - .config_init = gen10g_config_init, .config_aneg = gen10g_config_aneg, .read_status = cortina_read_status, .soft_reset = gen10g_no_soft_reset, diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c index 3ddbb9c32..cdbcea860 100644 --- a/drivers/net/phy/phy-c45.c +++ b/drivers/net/phy/phy-c45.c @@ -516,25 +516,11 @@ int gen10g_no_soft_reset(struct phy_device *phydev) } EXPORT_SYMBOL_GPL(gen10g_no_soft_reset); -int gen10g_config_init(struct phy_device *phydev) -{ - /* Temporarily just say we support everything */ - linkmode_zero(phydev->supported); - - linkmode_set_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT, - phydev->supported); - linkmode_copy(phydev->advertising, phydev->supported); - - return 0; -} -EXPORT_SYMBOL_GPL(gen10g_config_init); - struct phy_driver genphy_10g_driver = { .phy_id = 0xffffffff, .phy_id_mask = 0xffffffff, .name = "Generic 10G PHY", .soft_reset = gen10g_no_soft_reset, - .config_init = gen10g_config_init, .features = PHY_10GBIT_FEATURES, .config_aneg = gen10g_config_aneg, .read_status = gen10g_read_status, diff --git a/drivers/net/phy/teranetics.c b/drivers/net/phy/teranetics.c index 145c328b0..95280212d 100644 --- a/drivers/net/phy/teranetics.c +++ b/drivers/net/phy/teranetics.c @@ -80,7 +80,6 @@ static struct phy_driver teranetics_driver[] = { .features = PHY_10GBIT_FEATURES, .soft_reset = gen10g_no_soft_reset, .aneg_done = teranetics_aneg_done, - .config_init = gen10g_config_init, .config_aneg = gen10g_config_aneg, .read_status = teranetics_read_status, .match_phy_device = teranetics_match_phy_device, diff --git a/include/linux/phy.h b/include/linux/phy.h index c69de3b87..817c8453a 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -1121,7 +1121,6 @@ int genphy_c45_read_status(struct phy_device *phydev); int gen10g_config_aneg(struct phy_device *phydev); int gen10g_read_status(struct phy_device *phydev); int gen10g_no_soft_reset(struct phy_device *phydev); -int gen10g_config_init(struct phy_device *phydev); static inline int phy_read_status(struct phy_device *phydev) { -- 2.21.0