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

Commit c66b2581 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by David S. Miller
Browse files

sh_eth: reuse sh_eth_chip_reset() 



All the chip_reset() methods repeat the code writing to the ARSTR register
and delaying for 1 ms, so that we can reuse sh_eth_chip_reset() twice.

Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 79270922

drivers/net/ethernet/renesas/sh_eth.c

+2 −9
Original line number Diff line number Diff line
@@ -537,11 +537,7 @@ static struct sh_eth_cpu_data r7s72100_data = { 


static void sh_eth_chip_reset_r8a7740(struct net_device *ndev)

{

	struct sh_eth_private *mdp = netdev_priv(ndev);



	/* reset device */

	sh_eth_tsu_write(mdp, ARSTR_ARST, ARSTR);

	mdelay(1);

	sh_eth_chip_reset(ndev);



	sh_eth_select_mii(ndev);

}
@@ -725,7 +721,6 @@ static struct sh_eth_cpu_data sh7757_data = { 
#define GIGA_MAHR(port)		(SH_GIGA_ETH_BASE + 0x800 * (port) + 0x05c0)

static void sh_eth_chip_reset_giga(struct net_device *ndev)

{

	struct sh_eth_private *mdp = netdev_priv(ndev);

	u32 mahr[2], malr[2];

	int i;
@@ -735,9 +730,7 @@ static void sh_eth_chip_reset_giga(struct net_device *ndev) 
		mahr[i] = ioread32((void *)GIGA_MAHR(i));

	}



	/* reset device */

	sh_eth_tsu_write(mdp, ARSTR_ARST, ARSTR);

	mdelay(1);

	sh_eth_chip_reset(ndev);



	/* restore MAHR and MALR */

	for (i = 0; i < 2; i++) {