Patchwork ehea: add alias entry for portN properties

login
register
mail settings
Submitter Jeff Mahoney
Date May 2, 2012, 6:26 p.m.
Message ID <4FA17C4E.1030905@suse.com>
Download mbox | patch
Permalink /patch/156531/
State Deferred
Delegated to: David Miller
Headers show

Comments

Jeff Mahoney - May 2, 2012, 6:26 p.m.
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

Initially reported here:
https://bugzilla.novell.com/show_bug.cgi?id=435215

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Olaf Hering <ohering@suse.com>
---
 drivers/net/ethernet/ibm/ehea/ehea_main.c |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
brenohl@br.ibm.com - May 2, 2012, 6:34 p.m.
Thadeu,

Could you check this patch, please?

Thanks
On 05/02/2012 03:26 PM, Jeff Mahoney wrote:
> 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
> 
> Initially reported here:
> https://bugzilla.novell.com/show_bug.cgi?id=435215
> 
> Signed-off-by: Jeff Mahoney <jeffm@suse.com>
> Signed-off-by: Olaf Hering <ohering@suse.com>
> ---
>  drivers/net/ethernet/ibm/ehea/ehea_main.c |   14 +++++++++++++-
>  1 file changed, 13 insertions(+), 1 deletion(-)
> 
> --- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
> +++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
> @@ -103,6 +103,19 @@ static int __devinit ehea_probe_adapter(
> 
>  static int __devexit 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_t
>  	},
>  	{},
>  };
> -MODULE_DEVICE_TABLE(of, ehea_device_table);
> 
>  static struct of_platform_driver ehea_driver = {
>  	.driver = {

--
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

Patch

--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -103,6 +103,19 @@  static int __devinit ehea_probe_adapter(
 
 static int __devexit 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_t
 	},
 	{},
 };
-MODULE_DEVICE_TABLE(of, ehea_device_table);
 
 static struct of_platform_driver ehea_driver = {
 	.driver = {