From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755359Ab3EVM7o (ORCPT ); Wed, 22 May 2013 08:59:44 -0400 Received: from ip4-83-240-18-99.cust.nbox.cz ([83.240.18.99]:50101 "EHLO anemoi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754311Ab3EVM6l (ORCPT ); Wed, 22 May 2013 08:58:41 -0400 From: Jiri Slaby To: jirislaby@gmail.com Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, Olaf Hering , Jeff Mahoney , Jiri Slaby , Thadeu Lima de Souza Cascardo , netdev@vger.kernel.org, "David S. Miller" Subject: [PATCH -resend 2/6] ehea: add alias entry for portN properties Date: Wed, 22 May 2013 14:59:08 +0200 Message-Id: <1369227552-11743-2-git-send-email-jslaby@suse.cz> X-Mailer: git-send-email 1.8.2.3 In-Reply-To: <1369227552-11743-1-git-send-email-jslaby@suse.cz> References: <1369227552-11743-1-git-send-email-jslaby@suse.cz> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Olaf Hering Use separate table for alias entries in the ehea module, otherwise the probe() function will operate on the separate ports instead of the lhea-"root" entry of the device-tree References: https://bugzilla.novell.com/show_bug.cgi?id=435215 Signed-off-by: Jeff Mahoney Signed-off-by: Olaf Hering Signed-off-by: Jiri Slaby Cc: Thadeu Lima de Souza Cascardo Cc: netdev@vger.kernel.org Cc: "David S. Miller" --- drivers/net/ethernet/ibm/ehea/ehea_main.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c index 90ea0b1..1114418 100644 --- a/drivers/net/ethernet/ibm/ehea/ehea_main.c +++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c @@ -103,6 +103,19 @@ static int ehea_probe_adapter(struct platform_device *dev, static int ehea_remove(struct platform_device *dev); +static struct of_device_id ehea_module_device_table[] = { + { + .name = "lhea", + .compatible = "IBM,lhea", + }, + { + .type = "network", + .compatible = "IBM,lhea-ethernet", + }, + {}, +}; +MODULE_DEVICE_TABLE(of, ehea_module_device_table); + static struct of_device_id ehea_device_table[] = { { .name = "lhea", @@ -110,7 +123,6 @@ static struct of_device_id ehea_device_table[] = { }, {}, }; -MODULE_DEVICE_TABLE(of, ehea_device_table); static struct of_platform_driver ehea_driver = { .driver = { -- 1.8.2.3