Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 257d938a authored by Andy Fleming's avatar Andy Fleming Committed by David S. Miller
Browse files

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: default avatarAndy Fleming <afleming@freescale.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5eeabf51

drivers/net/gianfar.c

+1 −13
Original line number Diff line number Diff line
@@ -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);