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

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

sh_eth: Remove obsolete r8a779x-ether platform_device_id entries 



Since commit a483dcbf ("ARM: shmobile: lager: Remove legacy
board support"), R-Car Gen2 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 r8a779x_data by #ifdef CONFIG_OF as it's 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 99f84be6

drivers/net/ethernet/renesas/sh_eth.c

+2 −4
Original line number Diff line number Diff line
@@ -531,6 +531,7 @@ 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,
@@ -556,6 +557,7 @@ static struct sh_eth_cpu_data r8a779x_data = { 
	.hw_swap	= 1,

	.rmiimode	= 1,

};

#endif /* CONFIG_OF */



static void sh_eth_set_rate_sh7724(struct net_device *ndev)

{
@@ -3281,10 +3283,6 @@ static struct platform_device_id sh_eth_id_table[] = { 
	{ "sh7763-gether", (kernel_ulong_t)&sh7763_data },

	{ "r8a7740-gether", (kernel_ulong_t)&r8a7740_data },

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

	{ "r8a7790-ether", (kernel_ulong_t)&r8a779x_data },

	{ "r8a7791-ether", (kernel_ulong_t)&r8a779x_data },

	{ "r8a7793-ether", (kernel_ulong_t)&r8a779x_data },

	{ "r8a7794-ether", (kernel_ulong_t)&r8a779x_data },

	{ }

};

MODULE_DEVICE_TABLE(platform, sh_eth_id_table);