Skip to content

Commit 9eed637

Browse files
ChelsyRatnawatjarkkojs
authored andcommitted
tpm: Replace scnprintf() with sysfs_emit() and sysfs_emit_at() in sysfs show functions
Documentation/filesystems/sysfs.rst mentions that show() should only use sysfs_emit() or sysfs_emit_at() when formating the value to be returned to user space. So replace scnprintf() with sysfs_emit(). Signed-off-by: Chelsy Ratnawat <chelsyratnawat2001@gmail.com> Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org> Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
1 parent 89dd369 commit 9eed637

1 file changed

Lines changed: 25 additions & 27 deletions

File tree

drivers/char/tpm/tpm_ppi.c

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ static ssize_t tpm_show_ppi_version(struct device *dev,
5252
{
5353
struct tpm_chip *chip = to_tpm_chip(dev);
5454

55-
return scnprintf(buf, PAGE_SIZE, "%s\n", chip->ppi_version);
55+
return sysfs_emit(buf, "%s\n", chip->ppi_version);
5656
}
5757

5858
static ssize_t tpm_show_ppi_request(struct device *dev,
@@ -87,21 +87,19 @@ static ssize_t tpm_show_ppi_request(struct device *dev,
8787
else {
8888
req = obj->package.elements[1].integer.value;
8989
if (tpm_ppi_req_has_parameter(req))
90-
size = scnprintf(buf, PAGE_SIZE,
91-
"%llu %llu\n", req,
92-
obj->package.elements[2].integer.value);
90+
size = sysfs_emit(buf, "%llu %llu\n", req,
91+
obj->package.elements[2].integer.value);
9392
else
94-
size = scnprintf(buf, PAGE_SIZE,
95-
"%llu\n", req);
93+
size = sysfs_emit(buf, "%llu\n", req);
9694
}
9795
} else if (obj->package.count == 2 &&
9896
obj->package.elements[0].type == ACPI_TYPE_INTEGER &&
9997
obj->package.elements[1].type == ACPI_TYPE_INTEGER) {
10098
if (obj->package.elements[0].integer.value)
10199
size = -EFAULT;
102100
else
103-
size = scnprintf(buf, PAGE_SIZE, "%llu\n",
104-
obj->package.elements[1].integer.value);
101+
size = sysfs_emit(buf, "%llu\n",
102+
obj->package.elements[1].integer.value);
105103
}
106104

107105
ACPI_FREE(obj);
@@ -211,10 +209,10 @@ static ssize_t tpm_show_ppi_transition_action(struct device *dev,
211209
}
212210

213211
if (ret < ARRAY_SIZE(info) - 1)
214-
status = scnprintf(buf, PAGE_SIZE, "%d: %s\n", ret, info[ret]);
212+
status = sysfs_emit(buf, "%d: %s\n", ret, info[ret]);
215213
else
216-
status = scnprintf(buf, PAGE_SIZE, "%d: %s\n", ret,
217-
info[ARRAY_SIZE(info)-1]);
214+
status = sysfs_emit(buf, "%d: %s\n", ret,
215+
info[ARRAY_SIZE(info) - 1]);
218216
return status;
219217
}
220218

@@ -255,23 +253,23 @@ static ssize_t tpm_show_ppi_response(struct device *dev,
255253
res = ret_obj[2].integer.value;
256254
if (req) {
257255
if (res == 0)
258-
status = scnprintf(buf, PAGE_SIZE, "%llu %s\n", req,
259-
"0: Success");
256+
status = sysfs_emit(buf, "%llu %s\n", req,
257+
"0: Success");
260258
else if (res == 0xFFFFFFF0)
261-
status = scnprintf(buf, PAGE_SIZE, "%llu %s\n", req,
262-
"0xFFFFFFF0: User Abort");
259+
status = sysfs_emit(buf, "%llu %s\n", req,
260+
"0xFFFFFFF0: User Abort");
263261
else if (res == 0xFFFFFFF1)
264-
status = scnprintf(buf, PAGE_SIZE, "%llu %s\n", req,
265-
"0xFFFFFFF1: BIOS Failure");
262+
status = sysfs_emit(buf, "%llu %s\n", req,
263+
"0xFFFFFFF1: BIOS Failure");
266264
else if (res >= 1 && res <= 0x00000FFF)
267-
status = scnprintf(buf, PAGE_SIZE, "%llu %llu: %s\n",
268-
req, res, "Corresponding TPM error");
265+
status = sysfs_emit(buf, "%llu %llu: %s\n",
266+
req, res, "Corresponding TPM error");
269267
else
270-
status = scnprintf(buf, PAGE_SIZE, "%llu %llu: %s\n",
271-
req, res, "Error");
268+
status = sysfs_emit(buf, "%llu %llu: %s\n",
269+
req, res, "Error");
272270
} else {
273-
status = scnprintf(buf, PAGE_SIZE, "%llu: %s\n",
274-
req, "No Recent Request");
271+
status = sysfs_emit(buf, "%llu: %s\n",
272+
req, "No Recent Request");
275273
}
276274

277275
cleanup:
@@ -284,7 +282,7 @@ static ssize_t show_ppi_operations(acpi_handle dev_handle, char *buf, u32 start,
284282
{
285283
int i;
286284
u32 ret;
287-
char *str = buf;
285+
int len = 0;
288286
union acpi_object *obj, tmp;
289287
union acpi_object argv = ACPI_INIT_DSM_ARGV4(1, &tmp);
290288

@@ -314,11 +312,11 @@ static ssize_t show_ppi_operations(acpi_handle dev_handle, char *buf, u32 start,
314312
}
315313

316314
if (ret > 0 && ret < ARRAY_SIZE(info))
317-
str += scnprintf(str, PAGE_SIZE, "%d %d: %s\n",
318-
i, ret, info[ret]);
315+
len += sysfs_emit_at(buf, len, "%d %d: %s\n",
316+
i, ret, info[ret]);
319317
}
320318

321-
return str - buf;
319+
return len;
322320
}
323321

324322
static ssize_t tpm_show_ppi_tcg_operations(struct device *dev,

0 commit comments

Comments
 (0)