[PATCH] Add modalias to macio sysfs attributes

[PATCH] Add modalias to macio sysfs attributes

[Olaf Hering]

Provide a "compatible" entry in /sys/bus/macio/devices/*/
This can be used to load drivers via the modules.alias file.

Author: <schab@suse.de>
Signed-off-by: Olaf Hering <olh@suse.de>

--- linux-2.6.13-rc7/drivers/macintosh/macio_sysfs.c.~1~	2005-08-26 16:32:13.000000000 +0200
+++ linux-2.6.13-rc7/drivers/macintosh/macio_sysfs.c	2005-08-27 11:58:47.000000000 +0200
@@ -39,6 +39,31 @@ compatible_show (struct device *dev, str
 	return length;
 }
 
+static ssize_t modalias_show (struct device *dev, struct device_attribute *attr,
+			      char *buf)
+{
+	struct of_device *of;
+	char *compat;
+	int cplen;
+	int length;
+
+	of = &to_macio_device (dev)->ofdev;
+	compat = (char *) get_property (of->node, "compatible", &cplen);
+	if (!compat) compat = "", cplen = 1;
+	length = sprintf (buf, "of:N%sT%s", of->node->name, of->node->type);
+	buf += length;
+	while (cplen > 0) {
+		int l;
+		length += sprintf (buf, "C%s", compat);
+		buf += length;
+		l = strlen (compat) + 1;
+		compat += l;
+		cplen -= l;
+	}
+
+	return length;
+}
+
 macio_config_of_attr (name, "%s\n");
 macio_config_of_attr (type, "%s\n");
 
@@ -46,5 +71,6 @@ struct device_attribute macio_dev_attrs[
 	__ATTR_RO(name),
 	__ATTR_RO(type),
 	__ATTR_RO(compatible),
+	__ATTR_RO(modalias),
 	__ATTR_NULL
 };
-- 
short story of a lazy sysadmin:
 alias appserv=wotan

[PATCH] Add modalias for pmac network drivers

[Olaf Hering]

mesh, mac53c94 and airport already have an entry.
Add the network drivers for pmac.

Signed-off-by: Olaf Hering <olh@suse.de>

 drivers/net/bmac.c                   |    1 +
 drivers/net/mace.c                   |    1 +

Index: linux-2.6.12/drivers/net/bmac.c
===================================================================
--- linux-2.6.12.orig/drivers/net/bmac.c
+++ linux-2.6.12/drivers/net/bmac.c
@@ -1658,6 +1658,7 @@ static struct of_device_id bmac_match[] 
 	},
 	{},
 };
+MODULE_DEVICE_TABLE (of, bmac_match);
 
 static struct macio_driver bmac_driver = 
 {
Index: linux-2.6.12/drivers/net/mace.c
===================================================================
--- linux-2.6.12.orig/drivers/net/mace.c
+++ linux-2.6.12/drivers/net/mace.c
@@ -1016,6 +1016,7 @@ static struct of_device_id mace_match[] 
 	},
 	{},
 };
+MODULE_DEVICE_TABLE (of, mace_match);
 
 static struct macio_driver mace_driver = 
 {

-- 
short story of a lazy sysadmin:
 alias appserv=wotan

Re: [PATCH] Add modalias for pmac network drivers

[Benjamin Herrenschmidt]

On Mon, 2005-10-10 at 22:11 +0200, Olaf Hering wrote:
> mesh, mac53c94 and airport already have an entry.
> Add the network drivers for pmac.
> 
> Signed-off-by: Olaf Hering <olh@suse.de>

Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

>  drivers/net/bmac.c                   |    1 +
>  drivers/net/mace.c                   |    1 +
> 
> Index: linux-2.6.12/drivers/net/bmac.c
> ===================================================================
> --- linux-2.6.12.orig/drivers/net/bmac.c
> +++ linux-2.6.12/drivers/net/bmac.c
> @@ -1658,6 +1658,7 @@ static struct of_device_id bmac_match[] 
>  	},
>  	{},
>  };
> +MODULE_DEVICE_TABLE (of, bmac_match);
>  
>  static struct macio_driver bmac_driver = 
>  {
> Index: linux-2.6.12/drivers/net/mace.c
> ===================================================================
> --- linux-2.6.12.orig/drivers/net/mace.c
> +++ linux-2.6.12/drivers/net/mace.c
> @@ -1016,6 +1016,7 @@ static struct of_device_id mace_match[] 
>  	},
>  	{},
>  };
> +MODULE_DEVICE_TABLE (of, mace_match);
>  
>  static struct macio_driver mace_driver = 
>  {
> 

Re: [PATCH] Add modalias to macio sysfs attributes

[Benjamin Herrenschmidt]

On Mon, 2005-10-10 at 22:07 +0200, Olaf Hering wrote:
> Provide a "compatible" entry in /sys/bus/macio/devices/*/
> This can be used to load drivers via the modules.alias file.
> 
> Author: <schab@suse.de>
> Signed-off-by: Olaf Hering <olh@suse.de>

Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

> --- linux-2.6.13-rc7/drivers/macintosh/macio_sysfs.c.~1~	2005-08-26 16:32:13.000000000 +0200
> +++ linux-2.6.13-rc7/drivers/macintosh/macio_sysfs.c	2005-08-27 11:58:47.000000000 +0200
> @@ -39,6 +39,31 @@ compatible_show (struct device *dev, str
>  	return length;
>  }
>  
> +static ssize_t modalias_show (struct device *dev, struct device_attribute *attr,
> +			      char *buf)
> +{
> +	struct of_device *of;
> +	char *compat;
> +	int cplen;
> +	int length;
> +
> +	of = &to_macio_device (dev)->ofdev;
> +	compat = (char *) get_property (of->node, "compatible", &cplen);
> +	if (!compat) compat = "", cplen = 1;
> +	length = sprintf (buf, "of:N%sT%s", of->node->name, of->node->type);
> +	buf += length;
> +	while (cplen > 0) {
> +		int l;
> +		length += sprintf (buf, "C%s", compat);
> +		buf += length;
> +		l = strlen (compat) + 1;
> +		compat += l;
> +		cplen -= l;
> +	}
> +
> +	return length;
> +}
> +
>  macio_config_of_attr (name, "%s\n");
>  macio_config_of_attr (type, "%s\n");
>  
> @@ -46,5 +71,6 @@ struct device_attribute macio_dev_attrs[
>  	__ATTR_RO(name),
>  	__ATTR_RO(type),
>  	__ATTR_RO(compatible),
> +	__ATTR_RO(modalias),
>  	__ATTR_NULL
>  };