Skip to content

L
linux
Commit 33e82346 authored by YueHaibing's avatar YueHaibing Committed by Jason Gunthorpe
Browse files
Options

RDMA/srp: Use DEVICE_ATTR_*() macros 

Use DEVICE_ATTR_*() helpers instead of plain DEVICE_ATTR, which makes the
code a bit shorter and easier to read.

Link: https://lore.kernel.org/r/20210528125750.20788-1-yuehaibing@huawei.comSigned-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent c5b8eaf8
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 42 deletions
drivers/infiniband/ulp/srp/ib_srp.c
View file @ 33e82346
...@@ -2868,7 +2868,7 @@ static int srp_slave_configure(struct scsi_device *sdev) ...@@ -2868,7 +2868,7 @@ static int srp_slave_configure(struct scsi_device *sdev)
return 0; return 0;
} }
static ssize_t show_id_ext(struct device *dev, struct device_attribute *attr, static ssize_t id_ext_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct srp_target_port *target = host_to_target(class_to_shost(dev)); struct srp_target_port *target = host_to_target(class_to_shost(dev));
...@@ -2876,7 +2876,9 @@ static ssize_t show_id_ext(struct device *dev, struct device_attribute *attr, ...@@ -2876,7 +2876,9 @@ static ssize_t show_id_ext(struct device *dev, struct device_attribute *attr,
return sysfs_emit(buf, "0x%016llx\n", be64_to_cpu(target->id_ext)); return sysfs_emit(buf, "0x%016llx\n", be64_to_cpu(target->id_ext));
} }
static ssize_t show_ioc_guid(struct device *dev, struct device_attribute *attr, static DEVICE_ATTR_RO(id_ext);
static ssize_t ioc_guid_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct srp_target_port *target = host_to_target(class_to_shost(dev)); struct srp_target_port *target = host_to_target(class_to_shost(dev));
...@@ -2884,7 +2886,9 @@ static ssize_t show_ioc_guid(struct device *dev, struct device_attribute *attr, ...@@ -2884,7 +2886,9 @@ static ssize_t show_ioc_guid(struct device *dev, struct device_attribute *attr,
return sysfs_emit(buf, "0x%016llx\n", be64_to_cpu(target->ioc_guid)); return sysfs_emit(buf, "0x%016llx\n", be64_to_cpu(target->ioc_guid));
} }
static ssize_t show_service_id(struct device *dev, static DEVICE_ATTR_RO(ioc_guid);
static ssize_t service_id_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct srp_target_port *target = host_to_target(class_to_shost(dev)); struct srp_target_port *target = host_to_target(class_to_shost(dev));
...@@ -2895,7 +2899,9 @@ static ssize_t show_service_id(struct device *dev, ...@@ -2895,7 +2899,9 @@ static ssize_t show_service_id(struct device *dev,
be64_to_cpu(target->ib_cm.service_id)); be64_to_cpu(target->ib_cm.service_id));
} }
static ssize_t show_pkey(struct device *dev, struct device_attribute *attr, static DEVICE_ATTR_RO(service_id);
static ssize_t pkey_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct srp_target_port *target = host_to_target(class_to_shost(dev)); struct srp_target_port *target = host_to_target(class_to_shost(dev));
...@@ -2906,7 +2912,9 @@ static ssize_t show_pkey(struct device *dev, struct device_attribute *attr, ...@@ -2906,7 +2912,9 @@ static ssize_t show_pkey(struct device *dev, struct device_attribute *attr,
return sysfs_emit(buf, "0x%04x\n", be16_to_cpu(target->ib_cm.pkey)); return sysfs_emit(buf, "0x%04x\n", be16_to_cpu(target->ib_cm.pkey));
} }
static ssize_t show_sgid(struct device *dev, struct device_attribute *attr, static DEVICE_ATTR_RO(pkey);
static ssize_t sgid_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct srp_target_port *target = host_to_target(class_to_shost(dev)); struct srp_target_port *target = host_to_target(class_to_shost(dev));
...@@ -2914,7 +2922,9 @@ static ssize_t show_sgid(struct device *dev, struct device_attribute *attr, ...@@ -2914,7 +2922,9 @@ static ssize_t show_sgid(struct device *dev, struct device_attribute *attr,
return sysfs_emit(buf, "%pI6\n", target->sgid.raw); return sysfs_emit(buf, "%pI6\n", target->sgid.raw);
} }
static ssize_t show_dgid(struct device *dev, struct device_attribute *attr, static DEVICE_ATTR_RO(sgid);
static ssize_t dgid_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct srp_target_port *target = host_to_target(class_to_shost(dev)); struct srp_target_port *target = host_to_target(class_to_shost(dev));
...@@ -2926,8 +2936,10 @@ static ssize_t show_dgid(struct device *dev, struct device_attribute *attr, ...@@ -2926,8 +2936,10 @@ static ssize_t show_dgid(struct device *dev, struct device_attribute *attr,
return sysfs_emit(buf, "%pI6\n", ch->ib_cm.path.dgid.raw); return sysfs_emit(buf, "%pI6\n", ch->ib_cm.path.dgid.raw);
} }
static ssize_t show_orig_dgid(struct device *dev, static DEVICE_ATTR_RO(dgid);
struct device_attribute *attr, char *buf)
static ssize_t orig_dgid_show(struct device *dev, struct device_attribute *attr,
char *buf)
{ {
struct srp_target_port *target = host_to_target(class_to_shost(dev)); struct srp_target_port *target = host_to_target(class_to_shost(dev));
...@@ -2937,8 +2949,10 @@ static ssize_t show_orig_dgid(struct device *dev, ...@@ -2937,8 +2949,10 @@ static ssize_t show_orig_dgid(struct device *dev,
return sysfs_emit(buf, "%pI6\n", target->ib_cm.orig_dgid.raw); return sysfs_emit(buf, "%pI6\n", target->ib_cm.orig_dgid.raw);
} }
static ssize_t show_req_lim(struct device *dev, static DEVICE_ATTR_RO(orig_dgid);
struct device_attribute *attr, char *buf)
static ssize_t req_lim_show(struct device *dev, struct device_attribute *attr,
char *buf)
{ {
struct srp_target_port *target = host_to_target(class_to_shost(dev)); struct srp_target_port *target = host_to_target(class_to_shost(dev));
struct srp_rdma_ch *ch; struct srp_rdma_ch *ch;
...@@ -2952,7 +2966,9 @@ static ssize_t show_req_lim(struct device *dev, ...@@ -2952,7 +2966,9 @@ static ssize_t show_req_lim(struct device *dev,
return sysfs_emit(buf, "%d\n", req_lim); return sysfs_emit(buf, "%d\n", req_lim);
} }
static ssize_t show_zero_req_lim(struct device *dev, static DEVICE_ATTR_RO(req_lim);
static ssize_t zero_req_lim_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct srp_target_port *target = host_to_target(class_to_shost(dev)); struct srp_target_port *target = host_to_target(class_to_shost(dev));
...@@ -2960,7 +2976,9 @@ static ssize_t show_zero_req_lim(struct device *dev, ...@@ -2960,7 +2976,9 @@ static ssize_t show_zero_req_lim(struct device *dev,
return sysfs_emit(buf, "%d\n", target->zero_req_lim); return sysfs_emit(buf, "%d\n", target->zero_req_lim);
} }
static ssize_t show_local_ib_port(struct device *dev, static DEVICE_ATTR_RO(zero_req_lim);
static ssize_t local_ib_port_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct srp_target_port *target = host_to_target(class_to_shost(dev)); struct srp_target_port *target = host_to_target(class_to_shost(dev));
...@@ -2968,7 +2986,9 @@ static ssize_t show_local_ib_port(struct device *dev, ...@@ -2968,7 +2986,9 @@ static ssize_t show_local_ib_port(struct device *dev,
return sysfs_emit(buf, "%d\n", target->srp_host->port); return sysfs_emit(buf, "%d\n", target->srp_host->port);
} }
static ssize_t show_local_ib_device(struct device *dev, static DEVICE_ATTR_RO(local_ib_port);
static ssize_t local_ib_device_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct srp_target_port *target = host_to_target(class_to_shost(dev)); struct srp_target_port *target = host_to_target(class_to_shost(dev));
...@@ -2977,7 +2997,9 @@ static ssize_t show_local_ib_device(struct device *dev, ...@@ -2977,7 +2997,9 @@ static ssize_t show_local_ib_device(struct device *dev,
dev_name(&target->srp_host->srp_dev->dev->dev)); dev_name(&target->srp_host->srp_dev->dev->dev));
} }
static ssize_t show_ch_count(struct device *dev, struct device_attribute *attr, static DEVICE_ATTR_RO(local_ib_device);
static ssize_t ch_count_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct srp_target_port *target = host_to_target(class_to_shost(dev)); struct srp_target_port *target = host_to_target(class_to_shost(dev));
...@@ -2985,7 +3007,9 @@ static ssize_t show_ch_count(struct device *dev, struct device_attribute *attr, ...@@ -2985,7 +3007,9 @@ static ssize_t show_ch_count(struct device *dev, struct device_attribute *attr,
return sysfs_emit(buf, "%d\n", target->ch_count); return sysfs_emit(buf, "%d\n", target->ch_count);
} }
static ssize_t show_comp_vector(struct device *dev, static DEVICE_ATTR_RO(ch_count);
static ssize_t comp_vector_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct srp_target_port *target = host_to_target(class_to_shost(dev)); struct srp_target_port *target = host_to_target(class_to_shost(dev));
...@@ -2993,7 +3017,9 @@ static ssize_t show_comp_vector(struct device *dev, ...@@ -2993,7 +3017,9 @@ static ssize_t show_comp_vector(struct device *dev,
return sysfs_emit(buf, "%d\n", target->comp_vector); return sysfs_emit(buf, "%d\n", target->comp_vector);
} }
static ssize_t show_tl_retry_count(struct device *dev, static DEVICE_ATTR_RO(comp_vector);
static ssize_t tl_retry_count_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct srp_target_port *target = host_to_target(class_to_shost(dev)); struct srp_target_port *target = host_to_target(class_to_shost(dev));
...@@ -3001,7 +3027,9 @@ static ssize_t show_tl_retry_count(struct device *dev, ...@@ -3001,7 +3027,9 @@ static ssize_t show_tl_retry_count(struct device *dev,
return sysfs_emit(buf, "%d\n", target->tl_retry_count); return sysfs_emit(buf, "%d\n", target->tl_retry_count);
} }
static ssize_t show_cmd_sg_entries(struct device *dev, static DEVICE_ATTR_RO(tl_retry_count);
static ssize_t cmd_sg_entries_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct srp_target_port *target = host_to_target(class_to_shost(dev)); struct srp_target_port *target = host_to_target(class_to_shost(dev));
...@@ -3009,7 +3037,9 @@ static ssize_t show_cmd_sg_entries(struct device *dev, ...@@ -3009,7 +3037,9 @@ static ssize_t show_cmd_sg_entries(struct device *dev,
return sysfs_emit(buf, "%u\n", target->cmd_sg_cnt); return sysfs_emit(buf, "%u\n", target->cmd_sg_cnt);
} }
static ssize_t show_allow_ext_sg(struct device *dev, static DEVICE_ATTR_RO(cmd_sg_entries);
static ssize_t allow_ext_sg_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct srp_target_port *target = host_to_target(class_to_shost(dev)); struct srp_target_port *target = host_to_target(class_to_shost(dev));
...@@ -3017,22 +3047,7 @@ static ssize_t show_allow_ext_sg(struct device *dev, ...@@ -3017,22 +3047,7 @@ static ssize_t show_allow_ext_sg(struct device *dev,
return sysfs_emit(buf, "%s\n", target->allow_ext_sg ? "true" : "false"); return sysfs_emit(buf, "%s\n", target->allow_ext_sg ? "true" : "false");
} }
static DEVICE_ATTR(id_ext, S_IRUGO, show_id_ext, NULL); static DEVICE_ATTR_RO(allow_ext_sg);
static DEVICE_ATTR(ioc_guid, S_IRUGO, show_ioc_guid, NULL);
static DEVICE_ATTR(service_id, S_IRUGO, show_service_id, NULL);
static DEVICE_ATTR(pkey, S_IRUGO, show_pkey, NULL);
static DEVICE_ATTR(sgid, S_IRUGO, show_sgid, NULL);
static DEVICE_ATTR(dgid, S_IRUGO, show_dgid, NULL);
static DEVICE_ATTR(orig_dgid, S_IRUGO, show_orig_dgid, NULL);
static DEVICE_ATTR(req_lim, S_IRUGO, show_req_lim, NULL);
static DEVICE_ATTR(zero_req_lim, S_IRUGO, show_zero_req_lim, NULL);
static DEVICE_ATTR(local_ib_port, S_IRUGO, show_local_ib_port, NULL);
static DEVICE_ATTR(local_ib_device, S_IRUGO, show_local_ib_device, NULL);
static DEVICE_ATTR(ch_count, S_IRUGO, show_ch_count, NULL);
static DEVICE_ATTR(comp_vector, S_IRUGO, show_comp_vector, NULL);
static DEVICE_ATTR(tl_retry_count, S_IRUGO, show_tl_retry_count, NULL);
static DEVICE_ATTR(cmd_sg_entries, S_IRUGO, show_cmd_sg_entries, NULL);
static DEVICE_ATTR(allow_ext_sg, S_IRUGO, show_allow_ext_sg, NULL);
static struct device_attribute *srp_host_attrs[] = { static struct device_attribute *srp_host_attrs[] = {
&dev_attr_id_ext, &dev_attr_id_ext,
...@@ -3597,9 +3612,9 @@ static int srp_parse_options(struct net *net, const char *buf, ...@@ -3597,9 +3612,9 @@ static int srp_parse_options(struct net *net, const char *buf,
return ret; return ret;
} }
static ssize_t srp_create_target(struct device *dev, static ssize_t add_target_store(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr, const char *buf,
const char *buf, size_t count) size_t count)
{ {
struct srp_host *host = struct srp_host *host =
container_of(dev, struct srp_host, dev); container_of(dev, struct srp_host, dev);
...@@ -3842,9 +3857,9 @@ static ssize_t srp_create_target(struct device *dev, ...@@ -3842,9 +3857,9 @@ static ssize_t srp_create_target(struct device *dev,
goto out; goto out;
} }
static DEVICE_ATTR(add_target, S_IWUSR, NULL, srp_create_target); static DEVICE_ATTR_WO(add_target);
static ssize_t show_ibdev(struct device *dev, struct device_attribute *attr, static ssize_t ibdev_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct srp_host *host = container_of(dev, struct srp_host, dev); struct srp_host *host = container_of(dev, struct srp_host, dev);
...@@ -3852,9 +3867,9 @@ static ssize_t show_ibdev(struct device *dev, struct device_attribute *attr, ...@@ -3852,9 +3867,9 @@ static ssize_t show_ibdev(struct device *dev, struct device_attribute *attr,
return sysfs_emit(buf, "%s\n", dev_name(&host->srp_dev->dev->dev)); return sysfs_emit(buf, "%s\n", dev_name(&host->srp_dev->dev->dev));
} }
static DEVICE_ATTR(ibdev, S_IRUGO, show_ibdev, NULL); static DEVICE_ATTR_RO(ibdev);
static ssize_t show_port(struct device *dev, struct device_attribute *attr, static ssize_t port_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct srp_host *host = container_of(dev, struct srp_host, dev); struct srp_host *host = container_of(dev, struct srp_host, dev);
...@@ -3862,7 +3877,7 @@ static ssize_t show_port(struct device *dev, struct device_attribute *attr, ...@@ -3862,7 +3877,7 @@ static ssize_t show_port(struct device *dev, struct device_attribute *attr,
return sysfs_emit(buf, "%d\n", host->port); return sysfs_emit(buf, "%d\n", host->port);
} }
static DEVICE_ATTR(port, S_IRUGO, show_port, NULL); static DEVICE_ATTR_RO(port);
static struct srp_host *srp_add_port(struct srp_device *device, u8 port) static struct srp_host *srp_add_port(struct srp_device *device, u8 port)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7