[PATCH 1/2] sh_eth: Remove obsolete r7s72100-ether platform_device_id entry

[PATCH 1/2] sh_eth: Remove obsolete r7s72100-ether platform_device_id entry

[Geert Uytterhoeven]

Since commit 05104c266ae9a167 ("ARM: shmobile: r7s72100: genmai: Remove
legacy board file"), r7s72100 is 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.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 drivers/net/ethernet/renesas/sh_eth.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 7fb244f565b283b0..06ac93468e04aff8 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -3303,7 +3303,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 },
-	{ "r7s72100-ether", (kernel_ulong_t)&r7s72100_data },
 	{ "r8a7740-gether", (kernel_ulong_t)&r8a7740_data },
 	{ "r8a777x-ether", (kernel_ulong_t)&r8a777x_data },
 	{ "r8a7790-ether", (kernel_ulong_t)&r8a779x_data },
-- 
1.9.1

[PATCH 2/2] sh_eth: Remove obsolete r8a779x-ether platform_device_id entries

[Geert Uytterhoeven]

Since commit a483dcbfa21f919c ("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.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 drivers/net/ethernet/renesas/sh_eth.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 06ac93468e04aff8..70f3eff4ffc1d6f1 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -3305,10 +3305,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);
-- 
1.9.1

Re: [PATCH 1/2] sh_eth: Remove obsolete r7s72100-ether platform_device_id entry

[Simon Horman]

On Tue, Jun 23, 2015 at 03:01:01PM +0200, Geert Uytterhoeven wrote:
> Since commit 05104c266ae9a167 ("ARM: shmobile: r7s72100: genmai: Remove
> legacy board file"), r7s72100 is 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.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Acked-by: Simon Horman <horms+renesas@verge.net.au>

> ---
>  drivers/net/ethernet/renesas/sh_eth.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
> index 7fb244f565b283b0..06ac93468e04aff8 100644
> --- a/drivers/net/ethernet/renesas/sh_eth.c
> +++ b/drivers/net/ethernet/renesas/sh_eth.c
> @@ -3303,7 +3303,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 },
> -	{ "r7s72100-ether", (kernel_ulong_t)&r7s72100_data },
>  	{ "r8a7740-gether", (kernel_ulong_t)&r8a7740_data },
>  	{ "r8a777x-ether", (kernel_ulong_t)&r8a777x_data },
>  	{ "r8a7790-ether", (kernel_ulong_t)&r8a779x_data },
> -- 
> 1.9.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH 2/2] sh_eth: Remove obsolete r8a779x-ether platform_device_id entries

[Simon Horman]

On Tue, Jun 23, 2015 at 03:01:02PM +0200, Geert Uytterhoeven wrote:
> Since commit a483dcbfa21f919c ("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.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Acked-by: Simon Horman <horms+renesas@verge.net.au>

> ---
>  drivers/net/ethernet/renesas/sh_eth.c | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
> index 06ac93468e04aff8..70f3eff4ffc1d6f1 100644
> --- a/drivers/net/ethernet/renesas/sh_eth.c
> +++ b/drivers/net/ethernet/renesas/sh_eth.c
> @@ -3305,10 +3305,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);
> -- 
> 1.9.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH 1/2] sh_eth: Remove obsolete r7s72100-ether platform_device_id entry

[Geert Uytterhoeven]

Hi David,

On Wed, Jun 24, 2015 at 9:55 AM, David Miller <davem@davemloft.net> wrote:
> From: Geert Uytterhoeven <geert+renesas@glider.be>
> Date: Tue, 23 Jun 2015 15:01:01 +0200
>
>> Since commit 05104c266ae9a167 ("ARM: shmobile: r7s72100: genmai: Remove
>> legacy board file"), r7s72100 is 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.
>>
>> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
>
> These two changes are incomplete, please compile test your changes and
> look for warnings:
>
> drivers/net/ethernet/renesas/sh_eth.c:493:31: warning: ‘r8a779x_data’ defined but not used [-Wunused-variable]
> drivers/net/ethernet/renesas/sh_eth.c:803:31: warning: ‘r7s72100_data’ defined but not used [-Wunused-variable]

You're right. They're still used for DT matching, but I missed that
sh_eth_match_table[] is protected by #ifdef CONFIG_OF, which is always set
on ARM these days.

Sorry about that, will fix.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH 1/2] sh_eth: Remove obsolete r7s72100-ether platform_device_id entry

[David Miller]

From: Geert Uytterhoeven <geert+renesas@glider.be>
Date: Tue, 23 Jun 2015 15:01:01 +0200

> Since commit 05104c266ae9a167 ("ARM: shmobile: r7s72100: genmai: Remove
> legacy board file"), r7s72100 is 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.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

These two changes are incomplete, please compile test your changes and
look for warnings:

drivers/net/ethernet/renesas/sh_eth.c:493:31: warning: ‘r8a779x_data’ defined but not used [-Wunused-variable]
drivers/net/ethernet/renesas/sh_eth.c:803:31: warning: ‘r7s72100_data’ defined but not used [-Wunused-variable]