st: convert DRIVER_ATTR macros to DRIVER_ATTR_RO

Convert DRIVER_ATTR macros to DRIVER_ATTR_RO requested by
Greg KH. Also switched to using scnprintf instead of snprintf
per Documentation/filesystems/sysfs.txt.

Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Shane Seymour <shane.seymour@hp.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Kai Mäkisara <kai.makisara@kolumbus.fi>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
This commit is contained in:
Seymour, Shane M 2015-06-24 06:54:35 +00:00 committed by James Bottomley
parent a93429c300
commit 10978e48cc
1 changed files with 12 additions and 12 deletions

View File

@ -4427,29 +4427,29 @@ module_exit(exit_st);
/* The sysfs driver interface. Read-only at the moment */ /* The sysfs driver interface. Read-only at the moment */
static ssize_t st_try_direct_io_show(struct device_driver *ddp, char *buf) static ssize_t try_direct_io_show(struct device_driver *ddp, char *buf)
{ {
return snprintf(buf, PAGE_SIZE, "%d\n", try_direct_io); return scnprintf(buf, PAGE_SIZE, "%d\n", try_direct_io);
} }
static DRIVER_ATTR(try_direct_io, S_IRUGO, st_try_direct_io_show, NULL); static DRIVER_ATTR_RO(try_direct_io);
static ssize_t st_fixed_buffer_size_show(struct device_driver *ddp, char *buf) static ssize_t fixed_buffer_size_show(struct device_driver *ddp, char *buf)
{ {
return snprintf(buf, PAGE_SIZE, "%d\n", st_fixed_buffer_size); return scnprintf(buf, PAGE_SIZE, "%d\n", st_fixed_buffer_size);
} }
static DRIVER_ATTR(fixed_buffer_size, S_IRUGO, st_fixed_buffer_size_show, NULL); static DRIVER_ATTR_RO(fixed_buffer_size);
static ssize_t st_max_sg_segs_show(struct device_driver *ddp, char *buf) static ssize_t max_sg_segs_show(struct device_driver *ddp, char *buf)
{ {
return snprintf(buf, PAGE_SIZE, "%d\n", st_max_sg_segs); return scnprintf(buf, PAGE_SIZE, "%d\n", st_max_sg_segs);
} }
static DRIVER_ATTR(max_sg_segs, S_IRUGO, st_max_sg_segs_show, NULL); static DRIVER_ATTR_RO(max_sg_segs);
static ssize_t st_version_show(struct device_driver *ddd, char *buf) static ssize_t version_show(struct device_driver *ddd, char *buf)
{ {
return snprintf(buf, PAGE_SIZE, "[%s]\n", verstr); return scnprintf(buf, PAGE_SIZE, "[%s]\n", verstr);
} }
static DRIVER_ATTR(version, S_IRUGO, st_version_show, NULL); static DRIVER_ATTR_RO(version);
static struct attribute *st_drv_attrs[] = { static struct attribute *st_drv_attrs[] = {
&driver_attr_try_direct_io.attr, &driver_attr_try_direct_io.attr,