Commit 764e5582 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-stmmac-Use-readl_poll_timeout-to-simplify-the-code' 



Dejin Zheng says:

====================
net: stmmac: Use readl_poll_timeout() to simplify the code

This patch sets just for replace the open-coded loop to the
readl_poll_timeout() helper macro for simplify the code in
stmmac driver.

v2 -> v3:
	- return whatever error code by readl_poll_timeout() returned.
v1 -> v2:
	- no changed. I am a newbie and sent this patch a month
	  ago (February 6th). So far, I have not received any comments or
	  suggestion. I think it may be lost somewhere in the world, so
	  resend it.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a1dd3875 45d0da49

drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c

+4 −11
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 */



#include <linux/io.h>

#include <linux/iopoll.h>

#include <linux/delay.h>

#include "common.h"

#include "dwmac4_dma.h"
@@ -14,22 +15,14 @@ 
int dwmac4_dma_reset(void __iomem *ioaddr)

{

	u32 value = readl(ioaddr + DMA_BUS_MODE);

	int limit;



	/* 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)

		return -EBUSY;



	return 0;

	return readl_poll_timeout(ioaddr + DMA_BUS_MODE, value,

				 !(value & DMA_BUS_MODE_SFT_RESET),

				 10000, 100000);

}



void dwmac4_set_rx_tail_ptr(void __iomem *ioaddr, u32 tail_ptr, u32 chan)

drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c

+4 −11
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
*******************************************************************************/



#include <linux/io.h>

#include <linux/iopoll.h>

#include <linux/delay.h>

#include "common.h"

#include "stmmac_ptp.h"
@@ -53,7 +54,6 @@ static void config_sub_second_increment(void __iomem *ioaddr, 


static int init_systime(void __iomem *ioaddr, u32 sec, u32 nsec)

{

	int limit;

	u32 value;



	writel(sec, ioaddr + PTP_STSUR);
@@ -64,16 +64,9 @@ static int init_systime(void __iomem *ioaddr, u32 sec, u32 nsec) 
	writel(value, ioaddr + PTP_TCR);



	/* wait for present system time initialize to complete */

	limit = 10;

	while (limit--) {

		if (!(readl(ioaddr + PTP_TCR) & PTP_TCR_TSINIT))

			break;

		mdelay(10);

	}

	if (limit < 0)

		return -EBUSY;



	return 0;

	return readl_poll_timeout(ioaddr + PTP_TCR, value,

				 !(value & PTP_TCR_TSINIT),

				 10000, 100000);

}



static int config_addend(void __iomem *ioaddr, u32 addend)

CRA Git | Maintained and supported by SUSTech CRA and CCSE