Commit 3c6bff3c authored by Joe Perches's avatar Joe Perches Committed by Jason Gunthorpe

RDMA: Convert sysfs kobject * show functions to use sysfs_emit()

Done with cocci script:

@@
identifier k_show;
identifier arg1, arg2, arg3;
@@
ssize_t k_show(struct kobject *
-	arg1
+	kobj
	, struct kobj_attribute *
-	arg2
+	attr
	, char *
-	arg3
+	buf
	)
{
	...
(
-	arg1
+	kobj
|
-	arg2
+	attr
|
-	arg3
+	buf
)
	...
}

@@
identifier k_show;
identifier kobj, attr, buf;
@@

ssize_t k_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
{
	<...
	return
-	sprintf(buf,
+	sysfs_emit(buf,
	...);
	...>
}

@@
identifier k_show;
identifier kobj, attr, buf;
@@

ssize_t k_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
{
	<...
	return
-	snprintf(buf, PAGE_SIZE,
+	sysfs_emit(buf,
	...);
	...>
}

@@
identifier k_show;
identifier kobj, attr, buf;
@@

ssize_t k_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
{
	<...
	return
-	scnprintf(buf, PAGE_SIZE,
+	sysfs_emit(buf,
	...);
	...>
}

@@
identifier k_show;
identifier kobj, attr, buf;
expression chr;
@@

ssize_t k_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
{
	<...
	return
-	strcpy(buf, chr);
+	sysfs_emit(buf, chr);
	...>
}

@@
identifier k_show;
identifier kobj, attr, buf;
identifier len;
@@

ssize_t k_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
{
	<...
	len =
-	sprintf(buf,
+	sysfs_emit(buf,
	...);
	...>
	return len;
}

@@
identifier k_show;
identifier kobj, attr, buf;
identifier len;
@@

ssize_t k_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
{
	<...
	len =
-	snprintf(buf, PAGE_SIZE,
+	sysfs_emit(buf,
	...);
	...>
	return len;
}

@@
identifier k_show;
identifier kobj, attr, buf;
identifier len;
@@

ssize_t k_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
{
	<...
	len =
-	scnprintf(buf, PAGE_SIZE,
+	sysfs_emit(buf,
	...);
	...>
	return len;
}

@@
identifier k_show;
identifier kobj, attr, buf;
identifier len;
@@

ssize_t k_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
{
	<...
-	len += scnprintf(buf + len, PAGE_SIZE - len,
+	len += sysfs_emit_at(buf, len,
	...);
	...>
	return len;
}

@@
identifier k_show;
identifier kobj, attr, buf;
expression chr;
@@

ssize_t k_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
{
	...
-	strcpy(buf, chr);
-	return strlen(buf);
+	return sysfs_emit(buf, chr);
}

Link: https://lore.kernel.org/r/7761c1efaebb96c432c85171d58405c25a824ccd.1602122880.git.joe@perches.comSigned-off-by: default avatarJoe Perches <joe@perches.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Acked-by: default avatarJack Wang <jinpu.wang@cloud.ionos.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 1c7fd726
...@@ -188,20 +188,18 @@ static ssize_t rtrs_clt_state_show(struct kobject *kobj, ...@@ -188,20 +188,18 @@ static ssize_t rtrs_clt_state_show(struct kobject *kobj,
sess = container_of(kobj, struct rtrs_clt_sess, kobj); sess = container_of(kobj, struct rtrs_clt_sess, kobj);
if (sess->state == RTRS_CLT_CONNECTED) if (sess->state == RTRS_CLT_CONNECTED)
return sprintf(page, "connected\n"); return sysfs_emit(page, "connected\n");
return sprintf(page, "disconnected\n"); return sysfs_emit(page, "disconnected\n");
} }
static struct kobj_attribute rtrs_clt_state_attr = static struct kobj_attribute rtrs_clt_state_attr =
__ATTR(state, 0444, rtrs_clt_state_show, NULL); __ATTR(state, 0444, rtrs_clt_state_show, NULL);
static ssize_t rtrs_clt_reconnect_show(struct kobject *kobj, static ssize_t rtrs_clt_reconnect_show(struct kobject *kobj,
struct kobj_attribute *attr, struct kobj_attribute *attr, char *buf)
char *page)
{ {
return scnprintf(page, PAGE_SIZE, "Usage: echo 1 > %s\n", return sysfs_emit(buf, "Usage: echo 1 > %s\n", attr->attr.name);
attr->attr.name);
} }
static ssize_t rtrs_clt_reconnect_store(struct kobject *kobj, static ssize_t rtrs_clt_reconnect_store(struct kobject *kobj,
...@@ -229,11 +227,9 @@ static struct kobj_attribute rtrs_clt_reconnect_attr = ...@@ -229,11 +227,9 @@ static struct kobj_attribute rtrs_clt_reconnect_attr =
rtrs_clt_reconnect_store); rtrs_clt_reconnect_store);
static ssize_t rtrs_clt_disconnect_show(struct kobject *kobj, static ssize_t rtrs_clt_disconnect_show(struct kobject *kobj,
struct kobj_attribute *attr, struct kobj_attribute *attr, char *buf)
char *page)
{ {
return scnprintf(page, PAGE_SIZE, "Usage: echo 1 > %s\n", return sysfs_emit(buf, "Usage: echo 1 > %s\n", attr->attr.name);
attr->attr.name);
} }
static ssize_t rtrs_clt_disconnect_store(struct kobject *kobj, static ssize_t rtrs_clt_disconnect_store(struct kobject *kobj,
...@@ -261,11 +257,9 @@ static struct kobj_attribute rtrs_clt_disconnect_attr = ...@@ -261,11 +257,9 @@ static struct kobj_attribute rtrs_clt_disconnect_attr =
rtrs_clt_disconnect_store); rtrs_clt_disconnect_store);
static ssize_t rtrs_clt_remove_path_show(struct kobject *kobj, static ssize_t rtrs_clt_remove_path_show(struct kobject *kobj,
struct kobj_attribute *attr, struct kobj_attribute *attr, char *buf)
char *page)
{ {
return scnprintf(page, PAGE_SIZE, "Usage: echo 1 > %s\n", return sysfs_emit(buf, "Usage: echo 1 > %s\n", attr->attr.name);
attr->attr.name);
} }
static ssize_t rtrs_clt_remove_path_store(struct kobject *kobj, static ssize_t rtrs_clt_remove_path_store(struct kobject *kobj,
...@@ -328,7 +322,7 @@ static ssize_t rtrs_clt_hca_port_show(struct kobject *kobj, ...@@ -328,7 +322,7 @@ static ssize_t rtrs_clt_hca_port_show(struct kobject *kobj,
sess = container_of(kobj, typeof(*sess), kobj); sess = container_of(kobj, typeof(*sess), kobj);
return scnprintf(page, PAGE_SIZE, "%u\n", sess->hca_port); return sysfs_emit(page, "%u\n", sess->hca_port);
} }
static struct kobj_attribute rtrs_clt_hca_port_attr = static struct kobj_attribute rtrs_clt_hca_port_attr =
...@@ -342,7 +336,7 @@ static ssize_t rtrs_clt_hca_name_show(struct kobject *kobj, ...@@ -342,7 +336,7 @@ static ssize_t rtrs_clt_hca_name_show(struct kobject *kobj,
sess = container_of(kobj, struct rtrs_clt_sess, kobj); sess = container_of(kobj, struct rtrs_clt_sess, kobj);
return scnprintf(page, PAGE_SIZE, "%s\n", sess->hca_name); return sysfs_emit(page, "%s\n", sess->hca_name);
} }
static struct kobj_attribute rtrs_clt_hca_name_attr = static struct kobj_attribute rtrs_clt_hca_name_attr =
......
...@@ -27,11 +27,9 @@ static struct kobj_type ktype = { ...@@ -27,11 +27,9 @@ static struct kobj_type ktype = {
}; };
static ssize_t rtrs_srv_disconnect_show(struct kobject *kobj, static ssize_t rtrs_srv_disconnect_show(struct kobject *kobj,
struct kobj_attribute *attr, struct kobj_attribute *attr, char *buf)
char *page)
{ {
return scnprintf(page, PAGE_SIZE, "Usage: echo 1 > %s\n", return sysfs_emit(buf, "Usage: echo 1 > %s\n", attr->attr.name);
attr->attr.name);
} }
static ssize_t rtrs_srv_disconnect_store(struct kobject *kobj, static ssize_t rtrs_srv_disconnect_store(struct kobject *kobj,
...@@ -72,8 +70,7 @@ static ssize_t rtrs_srv_hca_port_show(struct kobject *kobj, ...@@ -72,8 +70,7 @@ static ssize_t rtrs_srv_hca_port_show(struct kobject *kobj,
sess = container_of(kobj, typeof(*sess), kobj); sess = container_of(kobj, typeof(*sess), kobj);
usr_con = sess->s.con[0]; usr_con = sess->s.con[0];
return scnprintf(page, PAGE_SIZE, "%u\n", return sysfs_emit(page, "%u\n", usr_con->cm_id->port_num);
usr_con->cm_id->port_num);
} }
static struct kobj_attribute rtrs_srv_hca_port_attr = static struct kobj_attribute rtrs_srv_hca_port_attr =
...@@ -87,8 +84,7 @@ static ssize_t rtrs_srv_hca_name_show(struct kobject *kobj, ...@@ -87,8 +84,7 @@ static ssize_t rtrs_srv_hca_name_show(struct kobject *kobj,
sess = container_of(kobj, struct rtrs_srv_sess, kobj); sess = container_of(kobj, struct rtrs_srv_sess, kobj);
return scnprintf(page, PAGE_SIZE, "%s\n", return sysfs_emit(page, "%s\n", sess->s.dev->ib_dev->name);
sess->s.dev->ib_dev->name);
} }
static struct kobj_attribute rtrs_srv_hca_name_attr = static struct kobj_attribute rtrs_srv_hca_name_attr =
......
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