From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f66.google.com ([74.125.82.66]:55004 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751559AbeCNUQ6 (ORCPT ); Wed, 14 Mar 2018 16:16:58 -0400 Received: by mail-wm0-f66.google.com with SMTP id h76so6480951wme.4 for ; Wed, 14 Mar 2018 13:16:57 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH RFC 7/7] net: phy: remove phy_stop_machine To: Florian Fainelli , Andrew Lunn Cc: Geert Uytterhoeven , "netdev@vger.kernel.org" References: <421476ed-03c7-63a0-44a4-c6d9c7702647@gmail.com> Message-ID: <74843e20-caed-6dbf-2708-ce64fe688178@gmail.com> Date: Wed, 14 Mar 2018 21:16:37 +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 the functionality of phy_stop() was integrated to __phy_stop() we can remove phy_stop_machine(). Signed-off-by: Heiner Kallweit --- drivers/net/phy/phy.c | 18 ------------------ drivers/net/phy/phy_device.c | 2 -- include/linux/phy.h | 1 - 3 files changed, 21 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 54144cd10..4c80e5ecb 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -565,24 +565,6 @@ void phy_trigger_machine(struct phy_device *phydev, bool sync) queue_delayed_work(system_power_efficient_wq, &phydev->state_queue, 0); } -/** - * phy_stop_machine - stop the PHY state machine tracking - * @phydev: target phy_device struct - * - * Description: Stops the state machine delayed workqueue, sets the - * state to UP (unless it wasn't up yet). This function must be - * called BEFORE phy_detach. - */ -void phy_stop_machine(struct phy_device *phydev) -{ - cancel_delayed_work_sync(&phydev->state_queue); - - mutex_lock(&phydev->lock); - if (phydev->state > PHY_UP && phydev->state != PHY_HALTED) - phydev->state = PHY_UP; - mutex_unlock(&phydev->lock); -} - /** * phy_error - enter HALTED state for this PHY device * @phydev: target phy_device struct diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index ed501fabe..75afefac5 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -830,8 +830,6 @@ void phy_disconnect(struct phy_device *phydev) if (phydev->irq > 0) phy_stop_interrupts(phydev); - phy_stop_machine(phydev); - phydev->adjust_link = NULL; phy_detach(phydev); diff --git a/include/linux/phy.h b/include/linux/phy.h index be43bd270..f51c68515 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -1032,7 +1032,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_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); void phy_ethtool_ksettings_get(struct phy_device *phydev, -- 2.16.2