On Thursday 26 August 2010 08:15:25 Dmitry Torokhov wrote:
> Instead of adding modalias attribute manually set it up as class's
> device attribute so driver core will create and remove it for us.
>
> Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
Acked-by: Carlos Corbacho <carlos@xxxxxxxxxxxxxxxxxxx>
> ---
>
> drivers/platform/x86/wmi.c | 15 +++++++--------
> 1 files changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
> index b4e5bea..781321b 100644
> --- a/drivers/platform/x86/wmi.c
> +++ b/drivers/platform/x86/wmi.c
> @@ -661,7 +661,7 @@ EXPORT_SYMBOL_GPL(wmi_has_guid);
> /*
> * sysfs interface
> */
> -static ssize_t show_modalias(struct device *dev, struct device_attribute
> *attr, +static ssize_t modalias_show(struct device *dev, struct
> device_attribute *attr, char *buf)
> {
> char guid_string[37];
> @@ -675,7 +675,11 @@ static ssize_t show_modalias(struct device *dev,
> struct device_attribute *attr,
>
> return sprintf(buf, "wmi:%s\n", guid_string);
> }
> -static DEVICE_ATTR(modalias, S_IRUGO, show_modalias, NULL);
> +
> +static struct device_attribute wmi_dev_attrs[] = {
> + __ATTR_RO(modalias),
> + __ATTR_NULL
> +};
>
> static int wmi_dev_uevent(struct device *dev, struct kobj_uevent_env *env)
> {
> @@ -708,6 +712,7 @@ static struct class wmi_class = {
> .name = "wmi",
> .dev_release = wmi_dev_free,
> .dev_uevent = wmi_dev_uevent,
> + .dev_attrs = wmi_dev_attrs,
> };
>
> static int wmi_create_devs(void)
> @@ -740,10 +745,6 @@ static int wmi_create_devs(void)
> result = device_register(guid_dev);
> if (result)
> return result;
> -
> - result = device_create_file(guid_dev, &dev_attr_modalias);
> - if (result)
> - return result;
> }
>
> return 0;
> @@ -763,8 +764,6 @@ static void wmi_remove_devs(void)
> guid_dev = wblock->dev;
> gblock = &wblock->gblock;
>
> - device_remove_file(guid_dev, &dev_attr_modalias);
> -
> device_unregister(guid_dev);
> }
> }
>
> --
> To unsubscribe from this list: send the line "unsubscribe
> platform-driver-x86" in the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
E-Mail: carlos@xxxxxxxxxxxxxxxxxxx
Web: strangeworlds.co.uk
GPG Key ID: 0x23EE722D
--
To unsubscribe from this list: send the line "unsubscribe platform-driver-x86" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
