From: Geert Uytterhoeven <geert+renesas@glider.be>
To: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org, linux-sh@vger.kernel.org,
Geert Uytterhoeven <geert+renesas@glider.be>
Subject: [PATCH v2 2/4] sh_eth: Remove obsolete r8a779x-ether platform_device_id entries
Date: Wed, 07 Oct 2015 08:14:15 +0000 [thread overview]
Message-ID: <1444205657-25314-3-git-send-email-geert+renesas@glider.be> (raw)
In-Reply-To: <1444205657-25314-1-git-send-email-geert+renesas@glider.be>
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.
Protect r8a779x_data by #ifdef CONFIG_OF as it's now referenced on DT
platforms only.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
---
v2:
- Add Acked-by,
- Protect r8a779x_data by #ifdef CONFIG_OF to silence a compiler
warning on SH.
---
drivers/net/ethernet/renesas/sh_eth.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 1bff9e21d920..029ea449f901 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -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)
{
@@ -3305,10 +3307,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
next prev parent reply other threads:[~2015-10-07 8:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-07 8:14 [PATCH v2 0/4] sh_eth: Remove obsolete platform_device_id entries Geert Uytterhoeven
2015-10-07 8:14 ` [PATCH v2 1/4] sh_eth: Remove obsolete r7s72100-ether platform_device_id entry Geert Uytterhoeven
2015-10-07 8:14 ` Geert Uytterhoeven [this message]
2015-10-07 8:14 ` [PATCH v2 3/4] sh_eth: Remove obsolete r8a7740-gether " Geert Uytterhoeven
2015-10-08 2:07 ` Simon Horman
2015-10-07 8:14 ` [PATCH v2 4/4] sh_eth: Remove obsolete r8a777x-ether " Geert Uytterhoeven
2015-10-08 2:07 ` Simon Horman
2015-10-08 11:54 ` [PATCH v2 0/4] sh_eth: Remove obsolete platform_device_id entries David Miller
2015-10-08 13:49 ` Geert Uytterhoeven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1444205657-25314-3-git-send-email-geert+renesas@glider.be \
--to=geert+renesas@glider.be \
--cc=davem@davemloft.net \
--cc=linux-sh@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).