openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net/fsl: Replace spin_event_timeout() with arch independent in xgmac_mdio 

spin_event_timeout() is PPC dependent, use an arch independent
equivalent instead.

Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Shaohui Xie 2015-01-21 19:08:32 +08:00 committed by David S. Miller
parent ca43e58ca2
commit 22f6bba77f
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/net/ethernet/freescale/xgmac_mdio.c
View File

@ -52,12 +52,16 @@ struct tgec_mdio_controller {
static int xgmac_wait_until_free(struct device *dev, static int xgmac_wait_until_free(struct device *dev,
struct tgec_mdio_controller __iomem *regs) struct tgec_mdio_controller __iomem *regs)
{ {
uint32_t status; unsigned int timeout;
/* Wait till the bus is free */ /* Wait till the bus is free */
status = spin_event_timeout( timeout = TIMEOUT;
!((ioread32be(&regs->mdio_stat)) & MDIO_STAT_BSY), TIMEOUT, 0); while ((ioread32be(&regs->mdio_stat) & MDIO_STAT_BSY) && timeout) {
if (!status) { cpu_relax();
timeout--;
}
if (!timeout) {
dev_err(dev, "timeout waiting for bus to be free\n"); dev_err(dev, "timeout waiting for bus to be free\n");
return -ETIMEDOUT; return -ETIMEDOUT;
} }
@ -71,12 +75,16 @@ static int xgmac_wait_until_free(struct device *dev,
static int xgmac_wait_until_done(struct device *dev, static int xgmac_wait_until_done(struct device *dev,
struct tgec_mdio_controller __iomem *regs) struct tgec_mdio_controller __iomem *regs)
{ {
uint32_t status; unsigned int timeout;
/* Wait till the MDIO write is complete */ /* Wait till the MDIO write is complete */
status = spin_event_timeout( timeout = TIMEOUT;
!((ioread32be(&regs->mdio_data)) & MDIO_DATA_BSY), TIMEOUT, 0); while ((ioread32be(&regs->mdio_data) & MDIO_DATA_BSY) && timeout) {
if (!status) { cpu_relax();
timeout--;
}
if (!timeout) {
dev_err(dev, "timeout waiting for operation to complete\n"); dev_err(dev, "timeout waiting for operation to complete\n");
return -ETIMEDOUT; return -ETIMEDOUT;
} }