sh_eth: Remove obsolete r8a777x-ether platform_device_id entry
authorGeert Uytterhoeven <geert+renesas@glider.be>
Tue, 24 Nov 2015 14:41:00 +0000 (15:41 +0100)
committerDavid S. Miller <davem@davemloft.net>
Tue, 24 Nov 2015 21:48:17 +0000 (16:48 -0500)
Since commit 3d7608e4c169af03 ("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: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/renesas/sh_eth.c

index 99618bf513b2618485e414c60dd83b79b50455aa..7f3c6109d45ed87419ecc2a38f855ae64cae8c97 100644 (file)
@@ -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);