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

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

sh_eth: remove sh_eth_cpu_data::rpadir_value 



If RPADIR exists, the value written to it is always the same for all SoCs
(and derived from NET_IP_ALIGN), so there has not  been any need to store
it in the *struct* sh_eth_cpu_data...

Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b13ca098

drivers/net/ethernet/renesas/sh_eth.c

+1 −7
Original line number Original line Diff line number Diff line
@@ -622,7 +622,6 @@ static struct sh_eth_cpu_data r7s72100_data = { 
	.tpauser	= 1,

	.tpauser	= 1,

	.hw_swap	= 1,

	.hw_swap	= 1,

	.rpadir		= 1,

	.rpadir		= 1,

	.rpadir_value   = 2 << 16,

	.no_trimd	= 1,

	.no_trimd	= 1,

	.no_ade		= 1,

	.no_ade		= 1,

	.xdfar_rw	= 1,

	.xdfar_rw	= 1,
@@ -672,7 +671,6 @@ static struct sh_eth_cpu_data r8a7740_data = { 
	.bculr		= 1,

	.bculr		= 1,

	.hw_swap	= 1,

	.hw_swap	= 1,

	.rpadir		= 1,

	.rpadir		= 1,

	.rpadir_value   = 2 << 16,

	.no_trimd	= 1,

	.no_trimd	= 1,

	.no_ade		= 1,

	.no_ade		= 1,

	.xdfar_rw	= 1,

	.xdfar_rw	= 1,
@@ -798,7 +796,6 @@ static struct sh_eth_cpu_data r8a77980_data = { 
	.hw_swap	= 1,

	.hw_swap	= 1,

	.nbst		= 1,

	.nbst		= 1,

	.rpadir		= 1,

	.rpadir		= 1,

	.rpadir_value   = 2 << 16,

	.no_trimd	= 1,

	.no_trimd	= 1,

	.no_ade		= 1,

	.no_ade		= 1,

	.xdfar_rw	= 1,

	.xdfar_rw	= 1,
@@ -851,7 +848,6 @@ static struct sh_eth_cpu_data sh7724_data = { 
	.tpauser	= 1,

	.tpauser	= 1,

	.hw_swap	= 1,

	.hw_swap	= 1,

	.rpadir		= 1,

	.rpadir		= 1,

	.rpadir_value	= 0x00020000, /* NET_IP_ALIGN assumed to be 2 */

};

};





static void sh_eth_set_rate_sh7757(struct net_device *ndev)

static void sh_eth_set_rate_sh7757(struct net_device *ndev)
@@ -898,7 +894,6 @@ static struct sh_eth_cpu_data sh7757_data = { 
	.hw_swap	= 1,

	.hw_swap	= 1,

	.no_ade		= 1,

	.no_ade		= 1,

	.rpadir		= 1,

	.rpadir		= 1,

	.rpadir_value   = 2 << 16,

	.rtrate		= 1,

	.rtrate		= 1,

	.dual_port	= 1,

	.dual_port	= 1,

};

};
@@ -978,7 +973,6 @@ static struct sh_eth_cpu_data sh7757_data_giga = { 
	.bculr		= 1,

	.bculr		= 1,

	.hw_swap	= 1,

	.hw_swap	= 1,

	.rpadir		= 1,

	.rpadir		= 1,

	.rpadir_value   = 2 << 16,

	.no_trimd	= 1,

	.no_trimd	= 1,

	.no_ade		= 1,

	.no_ade		= 1,

	.xdfar_rw	= 1,

	.xdfar_rw	= 1,
@@ -1467,7 +1461,7 @@ static int sh_eth_dev_init(struct net_device *ndev) 
	/* Descriptor format */

	/* Descriptor format */

	sh_eth_ring_format(ndev);

	sh_eth_ring_format(ndev);

	if (mdp->cd->rpadir)

	if (mdp->cd->rpadir)

		sh_eth_write(ndev, mdp->cd->rpadir_value, RPADIR);

		sh_eth_write(ndev, NET_IP_ALIGN << 16, RPADIR);





	/* all sh_eth int mask */

	/* all sh_eth int mask */

	sh_eth_write(ndev, 0, EESIPR);

	sh_eth_write(ndev, 0, EESIPR);

drivers/net/ethernet/renesas/sh_eth.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -487,7 +487,6 @@ struct sh_eth_cpu_data { 
	u32 ecsipr_value;

	u32 ecsipr_value;

	u32 fdr_value;

	u32 fdr_value;

	u32 fcftr_value;

	u32 fcftr_value;

	u32 rpadir_value;





	/* interrupt checking mask */

	/* interrupt checking mask */

	u32 tx_check;

	u32 tx_check;