From patchwork Thu Jan 3 01:10:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1020134 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=denx.de Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43VVJV17WMz9s7T for ; Thu, 3 Jan 2019 12:12:26 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729317AbfACBL1 (ORCPT ); Wed, 2 Jan 2019 20:11:27 -0500 Received: from mail-out.m-online.net ([212.18.0.9]:51655 "EHLO mail-out.m-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728869AbfACBLV (ORCPT ); Wed, 2 Jan 2019 20:11:21 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 43VVHD0P4Hz1qvfq; Thu, 3 Jan 2019 02:11:20 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 43VVHD0BnMz1qvWb; Thu, 3 Jan 2019 02:11:20 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id fMSJpKEjOISN; Thu, 3 Jan 2019 02:11:18 +0100 (CET) X-Auth-Info: CeTqdvR1K70h5J1GV8hlZpw0jdQTAqOlrfv06Vy6khU= Received: from kurokawa.lan (ip-86-49-110-70.net.upcbroadband.cz [86.49.110.70]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Thu, 3 Jan 2019 02:11:18 +0100 (CET) From: Marek Vasut To: netdev@vger.kernel.org Cc: Marek Vasut , "David S . Miller" , Nisar Sayed , Woojung Huh , Andrew Lunn , Florian Fainelli , linux-usb@vger.kernel.org Subject: [PATCH 13/19] usbnet: smsc95xx: Replace smsc95xx_link_ok_nopm() Date: Thu, 3 Jan 2019 02:10:34 +0100 Message-Id: <20190103011040.25974-14-marex@denx.de> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190103011040.25974-1-marex@denx.de> References: <20190103011040.25974-1-marex@denx.de> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Replace the function with genphy_update_link(), since that's really all that it is. Signed-off-by: Marek Vasut Cc: David S. Miller Cc: Nisar Sayed Cc: Woojung Huh Cc: Andrew Lunn Cc: Florian Fainelli Cc: linux-usb@vger.kernel.org To: netdev@vger.kernel.org --- drivers/net/usb/smsc95xx.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index fa33eda61275..401662f28f01 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -1427,16 +1427,11 @@ static int smsc95xx_link_ok_nopm(struct usbnet *dev) struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]); int ret; - /* first, a dummy read, needed to latch some MII phys */ - ret = phy_read(pdata->phydev, MII_BMSR); - if (ret < 0) - return ret; - - ret = phy_read(pdata->phydev, MII_BMSR); - if (ret < 0) + ret = genphy_update_link(pdata->phydev); + if (ret) return ret; - return !!(ret & BMSR_LSTATUS); + return pdata->phydev->link; } static int smsc95xx_enter_suspend0(struct usbnet *dev)