From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f195.google.com ([209.85.128.195]:42788 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751429AbeCPVZw (ORCPT ); Fri, 16 Mar 2018 17:25:52 -0400 Received: by mail-wr0-f195.google.com with SMTP id s18so12869755wrg.9 for ; Fri, 16 Mar 2018 14:25:51 -0700 (PDT) Subject: [PATCH RFC v2 7/7] net: phy: remove phy_stop_machine From: Heiner Kallweit To: Florian Fainelli , Andrew Lunn , Geert Uytterhoeven Cc: "netdev@vger.kernel.org" References: <6618f53c-778a-cb12-deb4-c618a728b43e@gmail.com> Message-ID: Date: Fri, 16 Mar 2018 22:25:31 +0100 MIME-Version: 1.0 In-Reply-To: <6618f53c-778a-cb12-deb4-c618a728b43e@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 --- v2: - no changes --- 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 6ffb9952..b6a24ab8 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 a33dec37..a0c39b4d 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -831,8 +831,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 780c2690..5c953bd3 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -1023,7 +1023,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 - Address error reported by Geert by changing call to phy_link_down()