From patchwork Sun Mar 22 06:55:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dejin Zheng X-Patchwork-Id: 222088 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=-9.8 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_HELO_NONE, SPF_PASS, USER_AGENT_GIT 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 9F032C43333 for ; Sun, 22 Mar 2020 06:56:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 71FDC20781 for ; Sun, 22 Mar 2020 06:56:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="t9SNdYF0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726869AbgCVG4M (ORCPT ); Sun, 22 Mar 2020 02:56:12 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:33590 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725892AbgCVG4L (ORCPT ); Sun, 22 Mar 2020 02:56:11 -0400 Received: by mail-pf1-f193.google.com with SMTP id j1so3061109pfe.0; Sat, 21 Mar 2020 23:56:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=y3mml8Osh1PWGbUYRNmnqwRXsHDi7cFIAqFgkDgX/F8=; b=t9SNdYF0wbq4CK+nIUFYD3siyNFFFW7C+CzpztqRRHbkBX/6EDft9Stt3LbJXHzl4s rPJG3TJfSQfUONpTSo05cbXofbousQxx76QtHVKy6G3qaiTi6CW6Zt22A2B0T6F2YPmh Pv7HqopMls03lACL8zcpA++mbnxavpBeM1jMKyN04fCDt3lnYih+zckzyDTOGIsCUQCE Rf3vX8NnhAH7N2i/dzr3oG47LXbKqG5vyYnouHBb5frPPE3minrNObnTcPLYND+Szx4m LqkqZERf3juZtlG6Oen7K8zbgwCCqfxgwbfTt7m+u7cwL7O7MbFRwurO5F2ZKjM7uK3W cPMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=y3mml8Osh1PWGbUYRNmnqwRXsHDi7cFIAqFgkDgX/F8=; b=ZPDaXo4+sAwrvOPQU4pwXyhk/NU6ka8Q40WrWomO6ylj9Ut0/+SZazfLW2eLPqA9CS VRHxWWXTM98RrpFlZQVjMmV5gps6E4/2qJgqiGp1yaVWYnEciEG9nWwZMI7qh6qmox/2 Ud+IYGrRif1D84KD3KhyZhDWagNszrWmo8J9QE5gnwN4E6cl+Cpqxf8yCw5rs77MIqEm O/1Jky+fuew/Q7MZZpY9Ws09MoU8q0fpaaTpD3kXAYJhLoyVs2pGZM4C8xNYBl4feAat iGW3o6L+q6J3RSe52GlRaGJ1ybH+zp9FnAiiTT1Kz/cG9oKwzSmF9K9aDvs1Wuh2rJDw 69rg== X-Gm-Message-State: ANhLgQ3yTc8ddIPCixUUS67JD4ZsTh4/mmy0FA8tclD79WaN00u9bpDZ rcn0tF4VK+iD8s44e6yOY60= X-Google-Smtp-Source: ADFU+vuYBlqZ/tbaYayNTrfEREMfbaS35+L/hFKMTZSDRLmqgLxHA7NmI+bZoNP/xkgW353iACHkww== X-Received: by 2002:a62:ce8a:: with SMTP id y132mr17956465pfg.163.1584860170531; Sat, 21 Mar 2020 23:56:10 -0700 (PDT) Received: from localhost (216.24.188.11.16clouds.com. [216.24.188.11]) by smtp.gmail.com with ESMTPSA id u5sm9974026pfb.153.2020.03.21.23.56.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 21 Mar 2020 23:56:10 -0700 (PDT) From: Dejin Zheng To: andrew@lunn.ch, f.fainelli@gmail.com, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, gregkh@linuxfoundation.org, broonie@kernel.org, alexios.zavras@intel.com, tglx@linutronix.de, mchehab+samsung@kernel.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dejin Zheng Subject: [PATCH net-next v4 2/9] iopoll: redefined readx_poll_timeout macro to simplify the code Date: Sun, 22 Mar 2020 14:55:48 +0800 Message-Id: <20200322065555.17742-3-zhengdejin5@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200322065555.17742-1-zhengdejin5@gmail.com> References: <20200322065555.17742-1-zhengdejin5@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org redefined readx_poll_timeout macro by read_poll_timeout to simplify the code. Signed-off-by: Dejin Zheng --- v3 -> v4: - no changed v2 -> v3: - no changed v1 -> v2: - no changed include/linux/iopoll.h | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/include/linux/iopoll.h b/include/linux/iopoll.h index 7d44a2e20267..29c016cd6249 100644 --- a/include/linux/iopoll.h +++ b/include/linux/iopoll.h @@ -72,25 +72,7 @@ * macros defined below rather than this macro directly. */ #define readx_poll_timeout(op, addr, val, cond, sleep_us, timeout_us) \ -({ \ - u64 __timeout_us = (timeout_us); \ - unsigned long __sleep_us = (sleep_us); \ - ktime_t __timeout = ktime_add_us(ktime_get(), __timeout_us); \ - might_sleep_if((__sleep_us) != 0); \ - for (;;) { \ - (val) = op(addr); \ - if (cond) \ - break; \ - if (__timeout_us && \ - ktime_compare(ktime_get(), __timeout) > 0) { \ - (val) = op(addr); \ - break; \ - } \ - if (__sleep_us) \ - usleep_range((__sleep_us >> 2) + 1, __sleep_us); \ - } \ - (cond) ? 0 : -ETIMEDOUT; \ -}) + read_poll_timeout(op, val, cond, sleep_us, timeout_us, addr) /** * readx_poll_timeout_atomic - Periodically poll an address until a condition is met or a timeout occurs From patchwork Sun Mar 22 06:55:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dejin Zheng X-Patchwork-Id: 222087 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=-9.8 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_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 11C03C54FCD for ; Sun, 22 Mar 2020 06:56:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DC2D62080C for ; Sun, 22 Mar 2020 06:56:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nvj8MmsO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726971AbgCVG4W (ORCPT ); Sun, 22 Mar 2020 02:56:22 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:39300 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725892AbgCVG4U (ORCPT ); Sun, 22 Mar 2020 02:56:20 -0400 Received: by mail-pf1-f196.google.com with SMTP id d25so5743791pfn.6; Sat, 21 Mar 2020 23:56:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=w7dg5mwf5hBLgGL0WYd3zbQSc32Vl1MfolHl5YvY8Pc=; b=nvj8MmsOGDqEeB4HLneG64ApzRU2R0LlfZrOCjWymsIpiF5X6XrccrAODIpOeY2Ohf V533OFe401bpd8l+/Gt5DpvT3NE+jVTWMO/6nR9MnHgAbI/DzDCcuz2sxUEzOGvRUCWI FriPq76l03pUn+rBfkupcUioRbsHsg51nDukM8+g60O37P2Thu4CqJoLdugpYhUm6IcU QmlKn9Kz54aKa8V5Fga63VWM21bLSObo1A+CGlxMyipyyWQDU4+3QsNR5lwkwUIJdaU7 5T60wwPlbTaO8c41Ekpk8RwNooFGUkc+l5S+O0g11c3tmIF3Y875ezKwj1/jZD95oEOY 7CfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=w7dg5mwf5hBLgGL0WYd3zbQSc32Vl1MfolHl5YvY8Pc=; b=EHPpfdMAGPb4sd0l4+lnzdzSu82mSxccwVQ/XtiTLevUD0NBfNfz5n6Hfs/xoNO/PW d9YvEDXtfl4kEN2xQSoV38XJ5Y1YBiY0wR3bIlbq0QIyDJ94mn8tiflmERnHq/uQmrlB SldnW3gBfc4B+eZawDuTsaBGBZ7Cs6+P3TWMKE4S7C5A6Qb8gEWbcflwcqUHuo2XWnHk lmVjT5h1u4WeZnDAp2zQ5j5M/So6X20rdAO27k+pwGW5GF6r8o7ADIO1tyR9Ifr1y8b0 0pmETUHW2m9hqEJ2cNc8zfBOSch0C30R91Xa5R9CPdmng3mVNGgBWxAgQRhJlRHv5otw AlPw== X-Gm-Message-State: ANhLgQ1JpJD8PECeKZX2+vwFIKieSjE+XafoEMvnIofqLBcPJIRS+RWo VqRs8y3rH7yEjvzVbep+jM4= X-Google-Smtp-Source: ADFU+vtU7uU1m6IY6PWZoJHIjgaCRReXZ0EXb3Mt5sRMpOpmxljVCYpv2wHUTh8SNSR0E2sCp6DFZg== X-Received: by 2002:a63:b34d:: with SMTP id x13mr16541196pgt.317.1584860179160; Sat, 21 Mar 2020 23:56:19 -0700 (PDT) Received: from localhost (216.24.188.11.16clouds.com. [216.24.188.11]) by smtp.gmail.com with ESMTPSA id 189sm9930789pfw.203.2020.03.21.23.56.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 21 Mar 2020 23:56:18 -0700 (PDT) From: Dejin Zheng To: andrew@lunn.ch, f.fainelli@gmail.com, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, gregkh@linuxfoundation.org, broonie@kernel.org, alexios.zavras@intel.com, tglx@linutronix.de, mchehab+samsung@kernel.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dejin Zheng Subject: [PATCH net-next v4 4/9] net: phy: bcm84881: use phy_read_mmd_poll_timeout() to simplify the code Date: Sun, 22 Mar 2020 14:55:50 +0800 Message-Id: <20200322065555.17742-5-zhengdejin5@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200322065555.17742-1-zhengdejin5@gmail.com> References: <20200322065555.17742-1-zhengdejin5@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org use phy_read_mmd_poll_timeout() to replace the poll codes for simplify bcm84881_wait_init() function. Signed-off-by: Dejin Zheng --- v3 -> v4: - no changed v2 -> v3: - adapt to it after modifying the parameter order of the newly added function v1 -> v2: - remove the handle of phy_read_mmd's return error. drivers/net/phy/bcm84881.c | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/drivers/net/phy/bcm84881.c b/drivers/net/phy/bcm84881.c index 14d55a77eb28..b70be775909c 100644 --- a/drivers/net/phy/bcm84881.c +++ b/drivers/net/phy/bcm84881.c @@ -22,30 +22,11 @@ enum { static int bcm84881_wait_init(struct phy_device *phydev) { - unsigned int tries = 20; - int ret, val; - - do { - val = phy_read_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_CTRL1); - if (val < 0) { - ret = val; - break; - } - if (!(val & MDIO_CTRL1_RESET)) { - ret = 0; - break; - } - if (!--tries) { - ret = -ETIMEDOUT; - break; - } - msleep(100); - } while (1); + int val; - if (ret) - phydev_err(phydev, "%s failed: %d\n", __func__, ret); - - return ret; + return phy_read_mmd_poll_timeout(phydev, MDIO_MMD_PMAPMD, MDIO_CTRL1, + val, !(val & MDIO_CTRL1_RESET), + 100000, 2000000); } static int bcm84881_config_init(struct phy_device *phydev) From patchwork Sun Mar 22 06:55:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dejin Zheng X-Patchwork-Id: 222086 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=-9.8 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_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 E5AF3C54FCF for ; Sun, 22 Mar 2020 06:56:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B81662077D for ; Sun, 22 Mar 2020 06:56:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="tEQPCNpb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727067AbgCVG4e (ORCPT ); Sun, 22 Mar 2020 02:56:34 -0400 Received: from mail-pj1-f65.google.com ([209.85.216.65]:35047 "EHLO mail-pj1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727048AbgCVG4c (ORCPT ); Sun, 22 Mar 2020 02:56:32 -0400 Received: by mail-pj1-f65.google.com with SMTP id g9so406157pjp.0; Sat, 21 Mar 2020 23:56:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WQSKzafM7XFxtd981Wvw9C+IRYOwS/r46Gbh5bxGTy4=; b=tEQPCNpb1lkCcr9Y/XcWR5g64jLNTWyDy/H3GhER6fx1AY7JRabIKemHRgv9Si/5p0 F+cL+4+3wV/D6xoLlKgGhs9DUV5cpn7g9lzulHLBhyob5Egn6ManbTpbtdCEsKntpuTF kZUXNXkPyB+zlu83L97lGt5Iq0JWxuGn6kkkaw9RCeV640V1B73npss4SgqEff7fvqUQ VaWcakYaeA+4YwIciX/RxczVuvvCVHF3xDPJ0bJNp3ZiiJ5zmwr4zWNybvkCb7sac4mj FdfVzgjPVlFzTjY5maiq2lmYxR1ngM9GtT4ivJk9OklCmVqD9sabArbDKu9xQAGc9Qpx wuqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WQSKzafM7XFxtd981Wvw9C+IRYOwS/r46Gbh5bxGTy4=; b=h5aolZ2cZkJMgmbweY37oPxZAnez6dV6/0+cRnQh+rRE6aBdW7IdvwQRcKl41fmH/L OEx7dxyxnMYssUSH9Wn70nHwgJCfV2GNGLWQxmwVsj6KlxKy29iy+Tbk27dxS2VMw/kv EObZUdZHpOdFxQ3bqRSILCC4r/qV0iuTtqm1vJgRcqCRYViUnDO4IONOpRsNBG37a6ai qRu/bjp3YuKiMbjbSIMMRVKQdTFKQrjInMGs6caoaPPDaccD7wFH+bkobC7JEtSU8RFR nlDcYllA8bCgUvGVvW9ucmqnyknx9x+wRKhiGfFMMo7aSWOr72iwnBuVjJUKaV3CtQ6o BoHA== X-Gm-Message-State: ANhLgQ0txOHT796SUO1FmWNqFEnEjg08gqwbVVatZNRhjCClvIRF/FzC 5kc/8K9SPRZ5riIKZp/RIWE= X-Google-Smtp-Source: ADFU+vsBiVU9jZYyVkYCP5Qui8BNsCPj7yjYFniAwCVmJux3OlYSGrQ8nsWEWOPHyGNHRmPl9VTRFA== X-Received: by 2002:a17:902:562:: with SMTP id 89mr16777632plf.58.1584860191049; Sat, 21 Mar 2020 23:56:31 -0700 (PDT) Received: from localhost (216.24.188.11.16clouds.com. [216.24.188.11]) by smtp.gmail.com with ESMTPSA id y30sm10271391pff.67.2020.03.21.23.56.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 21 Mar 2020 23:56:30 -0700 (PDT) From: Dejin Zheng To: andrew@lunn.ch, f.fainelli@gmail.com, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, gregkh@linuxfoundation.org, broonie@kernel.org, alexios.zavras@intel.com, tglx@linutronix.de, mchehab+samsung@kernel.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dejin Zheng Subject: [PATCH net-next v4 7/9] net: phy: introduce phy_read_poll_timeout macro Date: Sun, 22 Mar 2020 14:55:53 +0800 Message-Id: <20200322065555.17742-8-zhengdejin5@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200322065555.17742-1-zhengdejin5@gmail.com> References: <20200322065555.17742-1-zhengdejin5@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org it is sometimes necessary to poll a phy register by phy_read() function until its value satisfies some condition. introduce phy_read_poll_timeout() macros that do this. Suggested-by: Andrew Lunn Signed-off-by: Dejin Zheng --- v3 -> v4: - deal with precedence issues for parameter cond. v2 -> v3: - modify the parameter order of newly added functions. phy_read_poll_timeout(val, cond, sleep_us, timeout_us, \ phydev, regnum) || \/ phy_read_poll_timeout(phydev, regnum, val, cond, sleep_us, \ timeout_us) v1 -> v2: - pass a phydev and a regnum to replace args... parameter in the phy_read_poll_timeout(), and also handle the phy_read() function's return error. include/linux/phy.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/linux/phy.h b/include/linux/phy.h index 42a5ec9288d5..f2e0aea13a2f 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -714,6 +714,19 @@ static inline int phy_read(struct phy_device *phydev, u32 regnum) return mdiobus_read(phydev->mdio.bus, phydev->mdio.addr, regnum); } +#define phy_read_poll_timeout(phydev, regnum, val, cond, sleep_us, timeout_us) \ +({ \ + int ret = 0; \ + ret = read_poll_timeout(phy_read, val, (cond) || val < 0, sleep_us, \ + timeout_us, phydev, regnum); \ + if (val < 0) \ + ret = val; \ + if (ret) \ + phydev_err(phydev, "%s failed: %d\n", __func__, ret); \ + ret; \ +}) + + /** * __phy_read - convenience function for reading a given PHY register * @phydev: the phy_device struct From patchwork Sun Mar 22 06:55:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dejin Zheng X-Patchwork-Id: 222085 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=-9.8 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_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 2B658C54FCF for ; Sun, 22 Mar 2020 06:56:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F31BA20774 for ; Sun, 22 Mar 2020 06:56:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Mnkvwrd9" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727100AbgCVG4i (ORCPT ); Sun, 22 Mar 2020 02:56:38 -0400 Received: from mail-pj1-f67.google.com ([209.85.216.67]:50462 "EHLO mail-pj1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727070AbgCVG4g (ORCPT ); Sun, 22 Mar 2020 02:56:36 -0400 Received: by mail-pj1-f67.google.com with SMTP id v13so4530123pjb.0; Sat, 21 Mar 2020 23:56:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NlpkrNH8Vqp4VWa2PUxHS4ZCSTCXzOnC9l8dpUh9E04=; b=Mnkvwrd9JPEINP3EiVygq7CmAm0Rv2H7iUE6WzullP97qAHT7m3wSlXx00bXGY5mpu aOFebhsnY/p+5c8QiVDQ5LC1mgPd68Q+4E1lB3Sgp3tdHVfC2yAuZJcSRQsOHyGWXCrx KYTg8JxxE3d3yS74Gxc19w07bstCKnGa3nQdVhYxdMw1uFfrsRv0pUUsoA/HUKaS2mxR WcE3qUA3JeeWQWTwVQWccErLMqOlj/6TzP0WWflq6wYeB9AoPuPcVD29zLQPyFOmQ83w w1GoAqYuuegG+GGHyVLDa0ah69+ehaA0PFWAVvWRBcEqPoMyPa5DpGO0qSZ5glMiJFZQ bJfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NlpkrNH8Vqp4VWa2PUxHS4ZCSTCXzOnC9l8dpUh9E04=; b=CTueIFOml7yI7F0tH1BGiu6L2V7z7KQxNuOIBqipOwM/e+4OAJm2Qajqws8XQFeLWg evtVTHuOxunoMrFdvaxQsFTSnfgqyRflbqgJBFD10+F/vG9Z5FuNccozWEL3yp4hwbaD PMrzhEhYDzD3fneolVU9yjqvwq2I0RsmIn0Ln9SVeCZnANNrz8oxh8zC+qsA1FWzjKdh lmZSVIDcoDpoxFPNBHeu4pNX3qKgXRV4Fjci6ZOgyrZ50/55GJ5Lv6NmFra8uXnwNRRd Scj05kD8ZZ7ZDaXK16MXkq3waCwJs6tw1vNf+cxiStI/QxQjodVNUQOPoEiZ3INqegWa rCUA== X-Gm-Message-State: ANhLgQ2qE+Salq+NuwsijkwUfhUvdBzt2OgHb59M7Ak9Mn+opQAHXCcf ExDJ1jnUSk83R/4hQH4nWns= X-Google-Smtp-Source: ADFU+vs6l79wfzDQJQnRfoFQbGssozis7iaIzNyRNXK/VYIzlnFWX3rGtzVnFgbP2oDuVT6QYp88xw== X-Received: by 2002:a17:90a:c482:: with SMTP id j2mr18659260pjt.71.1584860194831; Sat, 21 Mar 2020 23:56:34 -0700 (PDT) Received: from localhost (216.24.188.11.16clouds.com. [216.24.188.11]) by smtp.gmail.com with ESMTPSA id i11sm8839886pje.30.2020.03.21.23.56.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 21 Mar 2020 23:56:34 -0700 (PDT) From: Dejin Zheng To: andrew@lunn.ch, f.fainelli@gmail.com, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, gregkh@linuxfoundation.org, broonie@kernel.org, alexios.zavras@intel.com, tglx@linutronix.de, mchehab+samsung@kernel.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dejin Zheng Subject: [PATCH net-next v4 8/9] net: phy: smsc: use phy_read_poll_timeout() to simplify the code Date: Sun, 22 Mar 2020 14:55:54 +0800 Message-Id: <20200322065555.17742-9-zhengdejin5@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200322065555.17742-1-zhengdejin5@gmail.com> References: <20200322065555.17742-1-zhengdejin5@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org use phy_read_poll_timeout() to replace the poll codes for simplify lan87xx_read_status() function. Suggested-by: Andrew Lunn Signed-off-by: Dejin Zheng --- v3 -> v4: - add this patch by Andrew's suggestion. Thanks Andrew! drivers/net/phy/smsc.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c index b73298250793..46b50b78c6f3 100644 --- a/drivers/net/phy/smsc.c +++ b/drivers/net/phy/smsc.c @@ -112,8 +112,6 @@ static int lan87xx_read_status(struct phy_device *phydev) int err = genphy_read_status(phydev); if (!phydev->link && priv->energy_enable) { - int i; - /* Disable EDPD to wake up PHY */ int rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS); if (rc < 0) @@ -125,15 +123,11 @@ static int lan87xx_read_status(struct phy_device *phydev) return rc; /* Wait max 640 ms to detect energy */ - for (i = 0; i < 64; i++) { - /* Sleep to allow link test pulses to be sent */ - msleep(10); - rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS); - if (rc < 0) - return rc; - if (rc & MII_LAN83C185_ENERGYON) - break; - } + phy_read_poll_timeout(phydev, MII_LAN83C185_CTRL_STATUS, rc, + rc & MII_LAN83C185_ENERGYON, 10000, + 640000); + if (rc < 0) + return rc; /* Re-enable EDPD */ rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS);