Re: [PATCH 12/15] HID: convert bus code to use dev_groups

[Jiri Kosina]

On Fri, 23 Aug 2013, Greg Kroah-Hartman wrote:

> The dev_attrs field of struct bus_type is going away soon, dev_groups
> should be used instead.  This converts the HID bus code to use
> the correct field.
> 
> Cc: Jiri Kosina <jkosina@xxxxxxx>
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

Acked-by: Jiri Kosina <jkosina@xxxxxxx>

> ---
>  drivers/hid/hid-core.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
> index 36668d1a..b8f1c77f 100644
> --- a/drivers/hid/hid-core.c
> +++ b/drivers/hid/hid-core.c
> @@ -1917,11 +1917,13 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *a,
>  
>  	return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;
>  }
> +static DEVICE_ATTR_RO(modalias);
>  
> -static struct device_attribute hid_dev_attrs[] = {
> -	__ATTR_RO(modalias),
> -	__ATTR_NULL,
> +static struct attribute *hid_dev_attrs[] = {
> +	&dev_attr_modalias.attr,
> +	NULL,
>  };
> +ATTRIBUTE_GROUPS(hid_dev);
>  
>  static int hid_uevent(struct device *dev, struct kobj_uevent_env *env)
>  {
> @@ -1949,7 +1951,7 @@ static int hid_uevent(struct device *dev, struct kobj_uevent_env *env)
>  
>  static struct bus_type hid_bus_type = {
>  	.name		= "hid",
> -	.dev_attrs	= hid_dev_attrs,
> +	.dev_groups	= hid_dev_groups,
>  	.match		= hid_bus_match,
>  	.probe		= hid_device_probe,
>  	.remove		= hid_device_remove,
> -- 
> 1.8.3.rc0.20.gb99dd2e
> 

-- 
Jiri Kosina
SUSE Labs
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/