diff options
| author | Andy Fleming <afleming@freescale.com> | 2008-12-16 15:25:45 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-16 15:25:45 -0800 |
| commit | 257d938a0c17838c740eb68f0005b041444ac2c2 (patch) | |
| tree | de3625da9ab82bedf79c08e5672ff4185462356d /drivers | |
| parent | 5eeabf5150878018d7c7092042f3b681f5b554b5 (diff) | |
| download | kernel_samsung_espresso10-257d938a0c17838c740eb68f0005b041444ac2c2.zip kernel_samsung_espresso10-257d938a0c17838c740eb68f0005b041444ac2c2.tar.gz kernel_samsung_espresso10-257d938a0c17838c740eb68f0005b041444ac2c2.tar.bz2 | |
gianfar: Use gfar_halt to stop DMA in gfar_probe
gfar_halt does everything we want to do there, including disabling
TX/RX. It also doesn't unnecessarily enable DMA if it's already
stopped.
Signed-off-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/gianfar.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 2635f5b..55e319f 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c @@ -225,19 +225,7 @@ static int gfar_probe(struct platform_device *pdev) /* Stop the DMA engine now, in case it was running before */ /* (The firmware could have used it, and left it running). */ - /* To do this, we write Graceful Receive Stop and Graceful */ - /* Transmit Stop, and then wait until the corresponding bits */ - /* in IEVENT indicate the stops have completed. */ - tempval = gfar_read(&priv->regs->dmactrl); - tempval &= ~(DMACTRL_GRS | DMACTRL_GTS); - gfar_write(&priv->regs->dmactrl, tempval); - - tempval = gfar_read(&priv->regs->dmactrl); - tempval |= (DMACTRL_GRS | DMACTRL_GTS); - gfar_write(&priv->regs->dmactrl, tempval); - - while (!(gfar_read(&priv->regs->ievent) & (IEVENT_GRSC | IEVENT_GTSC))) - cpu_relax(); + gfar_halt(dev); /* Reset MAC layer */ gfar_write(&priv->regs->maccfg1, MACCFG1_SOFT_RESET); |