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 DEE68C43381 for ; Sat, 2 Mar 2019 16:16:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ACAD820836 for ; Sat, 2 Mar 2019 16:16:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="T6xB3VLC" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726688AbfCBQQW (ORCPT ); Sat, 2 Mar 2019 11:16:22 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:39799 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726669AbfCBQQV (ORCPT ); Sat, 2 Mar 2019 11:16:21 -0500 Received: by mail-wr1-f66.google.com with SMTP id l5so989147wrw.6 for ; Sat, 02 Mar 2019 08:16:20 -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=ONQMRxyfeY4jFIXUgmhNU1aip/cbsY5M812RzSfsvwc=; b=T6xB3VLCWnrExnVRJoVdzt2I08VrA9RGn9HSYGkjfZ9ZO1K+zOWiHMa5PF8OAvoaau 01yxushdAUERJ1sgT3gHeKON/iR+bSsz7KylJmXl61qeKH/xtrObsLWptkvspsd4814o G41L3dquyoDA7MOm6Yh06BVv7Xe/CyPtDXH68HQKjjvYM6ClvJfiGNMf4YwCLVzz3jmV 8iMV0J3ODobtJFxVXGCQcMoSJUqpUk8xMDe8HEiBwE2zO0tl2YTu/2cC7KX8HmTaM6he B+37aYtUkstLW43iLegqLtrpfYJuINcMkf18eZgUH6kzt1jXorfwOrjJNqnaOyL2cWkV MyGg== 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=ONQMRxyfeY4jFIXUgmhNU1aip/cbsY5M812RzSfsvwc=; b=feAyMTMU+ElWQoQVcnigMxq+zBch2s8BnwsdBdCvS/KlXp7OjrdJEnKGeouwHEHxYa jPv233NCnBPU4LabFAslEVAHGJMZ4/AmLeJdb9laX2C0O/H2fvAUf/H5tbd0j6JjsXxT TwAtn+A+3+zJNR9xMFi5CA3/ntAetuVGK6rUkTNyPz+ygvI+QyDA40PAfK62/HGmItbN UHpCz7IJZc3/5aKeRuIXGOdpjnc/4v84t/Y+6KkLSb6soeZ7veKsVrnAPlPcCqLLegXM dq8QDl25BX9V/QB5VblIGwOHSwDRehDbRIyjjxT1jJLo9EQmAPfUuyuwyFGPu11u9zRI 3p0w== X-Gm-Message-State: APjAAAXQ9gSlsgiu+yvyQRdI/+lu4Fkq9HAf5JFr0/WJ+pZYxBgpee/Y pee9QaHEy1C3ZsRCexx5rBk7pGE7 X-Google-Smtp-Source: APXvYqzm5xcpuS0mlBfBk/j21Ilwf2nFVqJoSbCBYmEmry8Ubrtqq8keNoO0Vy0M3HeOb1aOxR0UgQ== X-Received: by 2002:adf:f6ca:: with SMTP id y10mr7125629wrp.148.1551543379533; Sat, 02 Mar 2019 08:16:19 -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 s3sm1051057wrt.81.2019.03.02.08.16.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 02 Mar 2019 08:16:19 -0800 (PST) Subject: [PATCH net-next 5/5] net: phy: remove gen10g_no_soft_reset 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: <97d4eb8e-3f75-1647-7ca3-26a5ddb5fda0@gmail.com> Date: Sat, 2 Mar 2019 17:13:11 +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 genphy_no_soft_reset and gen10g_no_soft_reset are both the same no-ops, one is enough. Signed-off-by: Heiner Kallweit --- drivers/net/phy/cortina.c | 2 +- drivers/net/phy/marvell10g.c | 4 ++-- drivers/net/phy/phy-c45.c | 9 +-------- drivers/net/phy/teranetics.c | 2 +- include/linux/phy.h | 1 - 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/drivers/net/phy/cortina.c b/drivers/net/phy/cortina.c index a64eb211c..856cdc36a 100644 --- a/drivers/net/phy/cortina.c +++ b/drivers/net/phy/cortina.c @@ -82,7 +82,7 @@ static struct phy_driver cortina_driver[] = { .features = PHY_10GBIT_FEATURES, .config_aneg = gen10g_config_aneg, .read_status = cortina_read_status, - .soft_reset = gen10g_no_soft_reset, + .soft_reset = genphy_no_soft_reset, .probe = cortina_probe, }, }; diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c index 580e91dea..3e1e83ba0 100644 --- a/drivers/net/phy/marvell10g.c +++ b/drivers/net/phy/marvell10g.c @@ -469,7 +469,7 @@ static struct phy_driver mv3310_drivers[] = { .phy_id_mask = MARVELL_PHY_ID_MASK, .name = "mv88x3310", .get_features = mv3310_get_features, - .soft_reset = gen10g_no_soft_reset, + .soft_reset = genphy_no_soft_reset, .config_init = mv3310_config_init, .probe = mv3310_probe, .suspend = mv3310_suspend, @@ -484,7 +484,7 @@ static struct phy_driver mv3310_drivers[] = { .name = "mv88x2110", .features = PHY_10GBIT_FEATURES, .probe = mv3310_probe, - .soft_reset = gen10g_no_soft_reset, + .soft_reset = genphy_no_soft_reset, .config_init = mv3310_config_init, .config_aneg = mv3310_config_aneg, .aneg_done = mv3310_aneg_done, diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c index 6cd4bd5e9..c596eb54e 100644 --- a/drivers/net/phy/phy-c45.c +++ b/drivers/net/phy/phy-c45.c @@ -508,18 +508,11 @@ static int gen10g_read_status(struct phy_device *phydev) return genphy_c45_read_link(phydev); } -int gen10g_no_soft_reset(struct phy_device *phydev) -{ - /* Do nothing for now */ - return 0; -} -EXPORT_SYMBOL_GPL(gen10g_no_soft_reset); - struct phy_driver genphy_10g_driver = { .phy_id = 0xffffffff, .phy_id_mask = 0xffffffff, .name = "Generic 10G PHY", - .soft_reset = gen10g_no_soft_reset, + .soft_reset = genphy_no_soft_reset, .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 95280212d..beb054b93 100644 --- a/drivers/net/phy/teranetics.c +++ b/drivers/net/phy/teranetics.c @@ -78,7 +78,7 @@ static struct phy_driver teranetics_driver[] = { .phy_id_mask = 0xffffffff, .name = "Teranetics TN2020", .features = PHY_10GBIT_FEATURES, - .soft_reset = gen10g_no_soft_reset, + .soft_reset = genphy_no_soft_reset, .aneg_done = teranetics_aneg_done, .config_aneg = gen10g_config_aneg, .read_status = teranetics_read_status, diff --git a/include/linux/phy.h b/include/linux/phy.h index 607942401..34084892a 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -1119,7 +1119,6 @@ int genphy_c45_read_status(struct phy_device *phydev); /* The gen10g_* functions are the old Clause 45 stub */ int gen10g_config_aneg(struct phy_device *phydev); -int gen10g_no_soft_reset(struct phy_device *phydev); static inline int phy_read_status(struct phy_device *phydev) { -- 2.21.0