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

Commit 1af2729c authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by David S. Miller
Browse files

sh_eth: Remove obsolete r8a777x-ether platform_device_id entry 



Since commit 3d7608e4 ("ARM: shmobile: bockw: remove legacy
board file and config"), R-Car Gen1 SoCs are only supported in generic
DT-only ARM multi-platform builds.  The driver doesn't need to match
platform devices by name anymore, hence remove the corresponding
platform_device_id entry.

Protect sh_eth_set_rate_r8a777x() and r8a777x_data by #ifdef CONFIG_OF,
as they're now referenced on DT platforms only.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a0f48be3

drivers/net/ethernet/renesas/sh_eth.c

+0 −3
Original line number Diff line number Diff line
@@ -551,7 +551,6 @@ static struct sh_eth_cpu_data r8a7740_data = { 
	.select_mii	= 1,

	.shift_rd0	= 1,

};

#endif /* CONFIG_OF */



/* There is CPU dependent code */

static void sh_eth_set_rate_r8a777x(struct net_device *ndev)
@@ -593,7 +592,6 @@ static struct sh_eth_cpu_data r8a777x_data = { 
	.hw_swap	= 1,

};



#ifdef CONFIG_OF

/* R8A7790/1 */

static struct sh_eth_cpu_data r8a779x_data = {

	.set_duplex	= sh_eth_set_duplex,
@@ -3281,7 +3279,6 @@ static struct platform_device_id sh_eth_id_table[] = { 
	{ "sh7757-ether", (kernel_ulong_t)&sh7757_data },

	{ "sh7757-gether", (kernel_ulong_t)&sh7757_data_giga },

	{ "sh7763-gether", (kernel_ulong_t)&sh7763_data },

	{ "r8a777x-ether", (kernel_ulong_t)&r8a777x_data },

	{ }

};

MODULE_DEVICE_TABLE(platform, sh_eth_id_table);