From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933356AbdBHNSb (ORCPT ); Wed, 8 Feb 2017 08:18:31 -0500 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:3435 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932087AbdBHNS2 (ORCPT ); Wed, 8 Feb 2017 08:18:28 -0500 Subject: Re: [PATCH v2 08/16] net: stmmac: Use readl_poll_timeout To: Corentin Labbe , , References: <20170208083121.27949-1-clabbe.montjoie@gmail.com> <20170208083121.27949-9-clabbe.montjoie@gmail.com> CC: From: Giuseppe CAVALLARO Message-ID: <653b51ad-bc37-e32a-daf3-625b15e652d5@st.com> Date: Wed, 8 Feb 2017 14:18:09 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.1.0 MIME-Version: 1.0 In-Reply-To: <20170208083121.27949-9-clabbe.montjoie@gmail.com> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.75.127.50] X-ClientProxiedBy: SFHDAG7NODE2.st.com (10.75.127.20) To SFHDAG4NODE1.st.com (10.75.127.10) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-02-08_09:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2/8/2017 9:31 AM, Corentin Labbe wrote: > The dwmac_dma_reset function use an open coded of readl_poll_timeout(). > Replace the open coded handling with the proper function. > > Signed-off-by: Corentin Labbe Acked-by: Giuseppe Cavallaro > --- > drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c | 14 ++++++-------- > 1 file changed, 6 insertions(+), 8 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c b/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c > index e4cda39..e60bfca 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c > @@ -17,6 +17,7 @@ > *******************************************************************************/ > > #include > +#include > #include "common.h" > #include "dwmac_dma.h" > > @@ -25,19 +26,16 @@ > int dwmac_dma_reset(void __iomem *ioaddr) > { > u32 value = readl(ioaddr + DMA_BUS_MODE); > - int limit; > + int err; > > /* DMA SW reset */ > value |= DMA_BUS_MODE_SFT_RESET; > writel(value, ioaddr + DMA_BUS_MODE); > - limit = 10; > - while (limit--) { > - if (!(readl(ioaddr + DMA_BUS_MODE) & DMA_BUS_MODE_SFT_RESET)) > - break; > - mdelay(10); > - } > > - if (limit < 0) > + err = readl_poll_timeout(ioaddr + DMA_BUS_MODE, value, > + !(value & DMA_BUS_MODE_SFT_RESET), > + 100000, 10000); > + if (err) > return -EBUSY; > > return 0; >