Re: [PATCH 24/36] SCSI: OSD: convert class code to use dev_groups

[Boaz Harrosh]

On 07/25/2013 01:05 AM, Greg Kroah-Hartman wrote:
> The dev_attrs field of struct class is going away soon, dev_groups
> should be used instead.  This converts the scsi osd class code to use
> the correct field.
> 
> Cc: Boaz Harrosh <bharrosh@xxxxxxxxxxx>

ACK-by: Boaz Harrosh <bharrosh@xxxxxxxxxxx>

Cool Thanks
> Cc: Benny Halevy <bhalevy@xxxxxxxxxx>
> Cc: James E.J. Bottomley <JBottomley@xxxxxxxxxxxxx>
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> ---
> 
> James, feel free to take this through your tree, or ACK it and I can
> take it through mine.
> 
>  drivers/scsi/osd/osd_uld.c | 13 ++++++++-----
>  1 file changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/scsi/osd/osd_uld.c b/drivers/scsi/osd/osd_uld.c
> index 9d86947d..e1d9a4c4 100644
> --- a/drivers/scsi/osd/osd_uld.c
> +++ b/drivers/scsi/osd/osd_uld.c
> @@ -107,6 +107,7 @@ static ssize_t osdname_show(struct device *dev, struct device_attribute *attr,
>  						   class_dev);
>  	return sprintf(buf, "%s\n", ould->odi.osdname);
>  }
> +static DEVICE_ATTR_RO(osdname);
>  
>  static ssize_t systemid_show(struct device *dev, struct device_attribute *attr,
>  			    char *buf)
> @@ -117,17 +118,19 @@ static ssize_t systemid_show(struct device *dev, struct device_attribute *attr,
>  	memcpy(buf, ould->odi.systemid, ould->odi.systemid_len);
>  	return ould->odi.systemid_len;
>  }
> +static DEVICE_ATTR_RO(systemid);
>  
> -static struct device_attribute osd_uld_attrs[] = {
> -	__ATTR(osdname, S_IRUGO, osdname_show, NULL),
> -	__ATTR(systemid, S_IRUGO, systemid_show, NULL),
> -	__ATTR_NULL,
> +static struct attribute *osd_uld_attrs[] = {
> +	&dev_attr_osdname.attr,
> +	&dev_attr_systemid.attr,
> +	NULL,
>  };
> +ATTRIBUTE_GROUPS(osd_uld);
>  
>  static struct class osd_uld_class = {
>  	.owner		= THIS_MODULE,
>  	.name		= "scsi_osd",
> -	.dev_attrs	= osd_uld_attrs,
> +	.dev_groups	= osd_uld_groups,
>  };
>  
>  /*
> 

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