mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 04:38:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

firewire: Kill unnecessary buf check in device_attribute.show

Browse Source 
Per Documentation/filesystems/sysfs.rst:
> sysfs allocates a buffer of size (PAGE_SIZE) and passes it to the
> method.

So we can kill the unnecessary buf check safely.

Signed-off-by: Li Zhijian <lizhijian@fujitsu.com>
Link: https://lore.kernel.org/r/20240122053942.80648-1-lizhijian@fujitsu.com
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
This commit is contained in:
Li Zhijian 2024-01-22 13:39:41 +08:00 committed by Takashi Sakamoto
parent e8f897f4af
commit 4a2b06ca33
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/firewire/core-device.c
View File

@ -322,7 +322,7 @@ static ssize_t show_immediate(struct device *dev,
if (value < 0)
return -ENOENT;
return snprintf(buf, buf ? PAGE_SIZE : 0, "0x%06x\n", value);
return snprintf(buf, PAGE_SIZE, "0x%06x\n", value);
}
#define IMMEDIATE_ATTR(name, key) \
@ -334,8 +334,6 @@ static ssize_t show_text_leaf(struct device *dev,
struct config_rom_attribute *attr =
container_of(dattr, struct config_rom_attribute, attr);
const u32 *directories[] = {NULL, NULL};
size_t bufsize;
char dummy_buf[2];
int i, ret = -ENOENT;
down_read(&fw_device_rwsem);
@ -357,15 +355,9 @@ static ssize_t show_text_leaf(struct device *dev,
}
}
if (buf) {
bufsize = PAGE_SIZE - 1;
} else {
buf = dummy_buf;
bufsize = 1;
}
for (i = 0; i < ARRAY_SIZE(directories) && !!directories[i]; ++i) {
int result = fw_csr_string(directories[i], attr->key, buf, bufsize);
int result = fw_csr_string(directories[i], attr->key, buf,
PAGE_SIZE - 1);
// Detected.
if (result >= 0) {
ret = result;