From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f196.google.com ([209.85.128.196]:41191 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751559AbeCNUQy (ORCPT ); Wed, 14 Mar 2018 16:16:54 -0400 Received: by mail-wr0-f196.google.com with SMTP id f14so6026678wre.8 for ; Wed, 14 Mar 2018 13:16:53 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH RFC 4/7] net: phy: remove phy_start_machine To: Florian Fainelli , Andrew Lunn Cc: Geert Uytterhoeven , "netdev@vger.kernel.org" References: <421476ed-03c7-63a0-44a4-c6d9c7702647@gmail.com> Message-ID: Date: Wed, 14 Mar 2018 21:16:30 +0100 MIME-Version: 1.0 In-Reply-To: <421476ed-03c7-63a0-44a4-c6d9c7702647@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org List-ID: Now that phy_start() integrated the functionality of phy_start_machine() we can remove it. Signed-off-by: Heiner Kallweit --- drivers/net/phy/phy.c | 16 ---------------- drivers/net/phy/phy_device.c | 1 - drivers/net/phy/phylink.c | 1 - include/linux/phy.h | 1 - 4 files changed, 19 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 0aef35efd..0ca1672a5 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -546,22 +546,6 @@ int phy_start_aneg(struct phy_device *phydev) } EXPORT_SYMBOL(phy_start_aneg); -/** - * phy_start_machine - start PHY state machine tracking - * @phydev: the phy_device struct - * - * Description: The PHY infrastructure can run a state machine - * which tracks whether the PHY is starting up, negotiating, - * etc. This function starts the delayed workqueue which tracks - * the state of the PHY. If you want to maintain your own state machine, - * do not call this function. - */ -void phy_start_machine(struct phy_device *phydev) -{ - queue_delayed_work(system_power_efficient_wq, &phydev->state_queue, HZ); -} -EXPORT_SYMBOL_GPL(phy_start_machine); - /** * phy_trigger_machine - trigger the state machine to run * diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index c6fd79758..08a5ff14f 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -768,7 +768,6 @@ int phy_connect_direct(struct net_device *dev, struct phy_device *phydev, return rc; phy_prepare_link(phydev, handler); - phy_start_machine(phydev); if (phydev->irq > 0) phy_start_interrupts(phydev); diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index 51a011a34..402d08899 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -694,7 +694,6 @@ static int phylink_bringup_phy(struct phylink *pl, struct phy_device *phy) __ETHTOOL_LINK_MODE_MASK_NBITS, pl->supported, phy->advertising); - phy_start_machine(phy); if (phy->irq > 0) phy_start_interrupts(phy); diff --git a/include/linux/phy.h b/include/linux/phy.h index 68127b002..bc7aa93c6 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -1022,7 +1022,6 @@ int phy_drivers_register(struct phy_driver *new_driver, int n, void phy_state_machine(struct work_struct *work); void phy_change_work(struct work_struct *work); void phy_mac_interrupt(struct phy_device *phydev); -void phy_start_machine(struct phy_device *phydev); void phy_stop_machine(struct phy_device *phydev); void phy_trigger_machine(struct phy_device *phydev, bool sync); int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd); -- 2.16.2