From patchwork Tue Nov 24 14:41:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 548115 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A22F01402A3 for ; Wed, 25 Nov 2015 01:41:13 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754170AbbKXOk6 (ORCPT ); Tue, 24 Nov 2015 09:40:58 -0500 Received: from xavier.telenet-ops.be ([195.130.132.52]:51454 "EHLO xavier.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753333AbbKXOk4 (ORCPT ); Tue, 24 Nov 2015 09:40:56 -0500 Received: from ayla.of.borg ([84.195.106.123]) by xavier.telenet-ops.be with bizsmtp id lSgv1r0042fm56U01Sgvlq; Tue, 24 Nov 2015 15:40:55 +0100 Received: from ramsan.of.borg ([192.168.97.29] helo=ramsan) by ayla.of.borg with esmtp (Exim 4.82) (envelope-from ) id 1a1Em6-00051H-Hv; Tue, 24 Nov 2015 15:40:54 +0100 Received: from geert by ramsan with local (Exim 4.82) (envelope-from ) id 1a1EmI-00022q-I3; Tue, 24 Nov 2015 15:41:06 +0100 From: Geert Uytterhoeven To: "David S. Miller" Cc: Sergei Shtylyov , netdev@vger.kernel.org, linux-sh@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v3 4/4] sh_eth: Remove obsolete r8a777x-ether platform_device_id entry Date: Tue, 24 Nov 2015 15:41:00 +0100 Message-Id: <1448376060-7803-5-git-send-email-geert+renesas@glider.be> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1448376060-7803-1-git-send-email-geert+renesas@glider.be> References: <1448376060-7803-1-git-send-email-geert+renesas@glider.be> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Acked-by: Simon Horman --- v3: - Add Acked-by, v2: - New. --- drivers/net/ethernet/renesas/sh_eth.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index 99618bf513b26184..7f3c6109d45ed874 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -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);