Commit aa838896 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman

drivers core: Use sysfs_emit and sysfs_emit_at for show(device *...) functions

Convert the various sprintf fmaily calls in sysfs device show functions
to sysfs_emit and sysfs_emit_at for PAGE_SIZE buffer safety.

Done with:

$ spatch -sp-file sysfs_emit_dev.cocci --in-place --max-width=80 .

And cocci script:

$ cat sysfs_emit_dev.cocci
@@
identifier d_show;
identifier dev, attr, buf;
@@

ssize_t d_show(struct device *dev, struct device_attribute *attr, char *buf)
{
	<...
	return
-	sprintf(buf,
+	sysfs_emit(buf,
	...);
	...>
}

@@
identifier d_show;
identifier dev, attr, buf;
@@

ssize_t d_show(struct device *dev, struct device_attribute *attr, char *buf)
{
	<...
	return
-	snprintf(buf, PAGE_SIZE,
+	sysfs_emit(buf,
	...);
	...>
}

@@
identifier d_show;
identifier dev, attr, buf;
@@

ssize_t d_show(struct device *dev, struct device_attribute *attr, char *buf)
{
	<...
	return
-	scnprintf(buf, PAGE_SIZE,
+	sysfs_emit(buf,
	...);
	...>
}

@@
identifier d_show;
identifier dev, attr, buf;
expression chr;
@@

ssize_t d_show(struct device *dev, struct device_attribute *attr, char *buf)
{
	<...
	return
-	strcpy(buf, chr);
+	sysfs_emit(buf, chr);
	...>
}

@@
identifier d_show;
identifier dev, attr, buf;
identifier len;
@@

ssize_t d_show(struct device *dev, struct device_attribute *attr, char *buf)
{
	<...
	len =
-	sprintf(buf,
+	sysfs_emit(buf,
	...);
	...>
	return len;
}

@@
identifier d_show;
identifier dev, attr, buf;
identifier len;
@@

ssize_t d_show(struct device *dev, struct device_attribute *attr, char *buf)
{
	<...
	len =
-	snprintf(buf, PAGE_SIZE,
+	sysfs_emit(buf,
	...);
	...>
	return len;
}

@@
identifier d_show;
identifier dev, attr, buf;
identifier len;
@@

ssize_t d_show(struct device *dev, struct device_attribute *attr, char *buf)
{
	<...
	len =
-	scnprintf(buf, PAGE_SIZE,
+	sysfs_emit(buf,
	...);
	...>
	return len;
}

@@
identifier d_show;
identifier dev, attr, buf;
identifier len;
@@

ssize_t d_show(struct device *dev, struct device_attribute *attr, char *buf)
{
	<...
-	len += scnprintf(buf + len, PAGE_SIZE - len,
+	len += sysfs_emit_at(buf, len,
	...);
	...>
	return len;
}

@@
identifier d_show;
identifier dev, attr, buf;
expression chr;
@@

ssize_t d_show(struct device *dev, struct device_attribute *attr, char *buf)
{
	...
-	strcpy(buf, chr);
-	return strlen(buf);
+	return sysfs_emit(buf, chr);
}
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Link: https://lore.kernel.org/r/3d033c33056d88bbe34d4ddb62afd05ee166ab9a.1600285923.git.joe@perches.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2efc459d
...@@ -71,7 +71,7 @@ static ssize_t cpu_capacity_show(struct device *dev, ...@@ -71,7 +71,7 @@ static ssize_t cpu_capacity_show(struct device *dev,
{ {
struct cpu *cpu = container_of(dev, struct cpu, dev); struct cpu *cpu = container_of(dev, struct cpu, dev);
return sprintf(buf, "%lu\n", topology_get_cpu_scale(cpu->dev.id)); return sysfs_emit(buf, "%lu\n", topology_get_cpu_scale(cpu->dev.id));
} }
static void update_topology_flags_workfn(struct work_struct *work); static void update_topology_flags_workfn(struct work_struct *work);
......
...@@ -377,7 +377,7 @@ static ssize_t size_show(struct device *dev, ...@@ -377,7 +377,7 @@ static ssize_t size_show(struct device *dev,
{ {
struct cacheinfo *this_leaf = dev_get_drvdata(dev); struct cacheinfo *this_leaf = dev_get_drvdata(dev);
return sprintf(buf, "%uK\n", this_leaf->size >> 10); return sysfs_emit(buf, "%uK\n", this_leaf->size >> 10);
} }
static ssize_t shared_cpumap_show_func(struct device *dev, bool list, char *buf) static ssize_t shared_cpumap_show_func(struct device *dev, bool list, char *buf)
...@@ -407,11 +407,11 @@ static ssize_t type_show(struct device *dev, ...@@ -407,11 +407,11 @@ static ssize_t type_show(struct device *dev,
switch (this_leaf->type) { switch (this_leaf->type) {
case CACHE_TYPE_DATA: case CACHE_TYPE_DATA:
return sprintf(buf, "Data\n"); return sysfs_emit(buf, "Data\n");
case CACHE_TYPE_INST: case CACHE_TYPE_INST:
return sprintf(buf, "Instruction\n"); return sysfs_emit(buf, "Instruction\n");
case CACHE_TYPE_UNIFIED: case CACHE_TYPE_UNIFIED:
return sprintf(buf, "Unified\n"); return sysfs_emit(buf, "Unified\n");
default: default:
return -EINVAL; return -EINVAL;
} }
...@@ -425,11 +425,11 @@ static ssize_t allocation_policy_show(struct device *dev, ...@@ -425,11 +425,11 @@ static ssize_t allocation_policy_show(struct device *dev,
int n = 0; int n = 0;
if ((ci_attr & CACHE_READ_ALLOCATE) && (ci_attr & CACHE_WRITE_ALLOCATE)) if ((ci_attr & CACHE_READ_ALLOCATE) && (ci_attr & CACHE_WRITE_ALLOCATE))
n = sprintf(buf, "ReadWriteAllocate\n"); n = sysfs_emit(buf, "ReadWriteAllocate\n");
else if (ci_attr & CACHE_READ_ALLOCATE) else if (ci_attr & CACHE_READ_ALLOCATE)
n = sprintf(buf, "ReadAllocate\n"); n = sysfs_emit(buf, "ReadAllocate\n");
else if (ci_attr & CACHE_WRITE_ALLOCATE) else if (ci_attr & CACHE_WRITE_ALLOCATE)
n = sprintf(buf, "WriteAllocate\n"); n = sysfs_emit(buf, "WriteAllocate\n");
return n; return n;
} }
...@@ -441,9 +441,9 @@ static ssize_t write_policy_show(struct device *dev, ...@@ -441,9 +441,9 @@ static ssize_t write_policy_show(struct device *dev,
int n = 0; int n = 0;
if (ci_attr & CACHE_WRITE_THROUGH) if (ci_attr & CACHE_WRITE_THROUGH)
n = sprintf(buf, "WriteThrough\n"); n = sysfs_emit(buf, "WriteThrough\n");
else if (ci_attr & CACHE_WRITE_BACK) else if (ci_attr & CACHE_WRITE_BACK)
n = sprintf(buf, "WriteBack\n"); n = sysfs_emit(buf, "WriteBack\n");
return n; return n;
} }
......
...@@ -260,7 +260,7 @@ static ssize_t status_show(struct device *dev, ...@@ -260,7 +260,7 @@ static ssize_t status_show(struct device *dev,
default: default:
status = "unknown"; break; status = "unknown"; break;
} }
return sprintf(buf, "%s\n", status); return sysfs_emit(buf, "%s\n", status);
} }
static DEVICE_ATTR_RO(status); static DEVICE_ATTR_RO(status);
...@@ -277,7 +277,7 @@ static ssize_t auto_remove_on_show(struct device *dev, ...@@ -277,7 +277,7 @@ static ssize_t auto_remove_on_show(struct device *dev,
else else
str = "never"; str = "never";
return sprintf(buf, "%s\n", str); return sysfs_emit(buf, "%s\n", str);
} }
static DEVICE_ATTR_RO(auto_remove_on); static DEVICE_ATTR_RO(auto_remove_on);
...@@ -286,7 +286,7 @@ static ssize_t runtime_pm_show(struct device *dev, ...@@ -286,7 +286,7 @@ static ssize_t runtime_pm_show(struct device *dev,
{ {
struct device_link *link = to_devlink(dev); struct device_link *link = to_devlink(dev);
return sprintf(buf, "%d\n", !!(link->flags & DL_FLAG_PM_RUNTIME)); return sysfs_emit(buf, "%d\n", !!(link->flags & DL_FLAG_PM_RUNTIME));
} }
static DEVICE_ATTR_RO(runtime_pm); static DEVICE_ATTR_RO(runtime_pm);
...@@ -295,7 +295,8 @@ static ssize_t sync_state_only_show(struct device *dev, ...@@ -295,7 +295,8 @@ static ssize_t sync_state_only_show(struct device *dev,
{ {
struct device_link *link = to_devlink(dev); struct device_link *link = to_devlink(dev);
return sprintf(buf, "%d\n", !!(link->flags & DL_FLAG_SYNC_STATE_ONLY)); return sysfs_emit(buf, "%d\n",
!!(link->flags & DL_FLAG_SYNC_STATE_ONLY));
} }
static DEVICE_ATTR_RO(sync_state_only); static DEVICE_ATTR_RO(sync_state_only);
...@@ -1060,7 +1061,7 @@ static ssize_t waiting_for_supplier_show(struct device *dev, ...@@ -1060,7 +1061,7 @@ static ssize_t waiting_for_supplier_show(struct device *dev,
&& dev->links.need_for_probe; && dev->links.need_for_probe;
mutex_unlock(&wfs_lock); mutex_unlock(&wfs_lock);
device_unlock(dev); device_unlock(dev);
return sprintf(buf, "%u\n", val); return sysfs_emit(buf, "%u\n", val);
} }
static DEVICE_ATTR_RO(waiting_for_supplier); static DEVICE_ATTR_RO(waiting_for_supplier);
...@@ -1710,7 +1711,7 @@ ssize_t device_show_ulong(struct device *dev, ...@@ -1710,7 +1711,7 @@ ssize_t device_show_ulong(struct device *dev,
char *buf) char *buf)
{ {
struct dev_ext_attribute *ea = to_ext_attr(attr); struct dev_ext_attribute *ea = to_ext_attr(attr);
return snprintf(buf, PAGE_SIZE, "%lx\n", *(unsigned long *)(ea->var)); return sysfs_emit(buf, "%lx\n", *(unsigned long *)(ea->var));
} }
EXPORT_SYMBOL_GPL(device_show_ulong); EXPORT_SYMBOL_GPL(device_show_ulong);
...@@ -1740,7 +1741,7 @@ ssize_t device_show_int(struct device *dev, ...@@ -1740,7 +1741,7 @@ ssize_t device_show_int(struct device *dev,
{ {
struct dev_ext_attribute *ea = to_ext_attr(attr); struct dev_ext_attribute *ea = to_ext_attr(attr);
return snprintf(buf, PAGE_SIZE, "%d\n", *(int *)(ea->var)); return sysfs_emit(buf, "%d\n", *(int *)(ea->var));
} }
EXPORT_SYMBOL_GPL(device_show_int); EXPORT_SYMBOL_GPL(device_show_int);
...@@ -1761,7 +1762,7 @@ ssize_t device_show_bool(struct device *dev, struct device_attribute *attr, ...@@ -1761,7 +1762,7 @@ ssize_t device_show_bool(struct device *dev, struct device_attribute *attr,
{ {
struct dev_ext_attribute *ea = to_ext_attr(attr); struct dev_ext_attribute *ea = to_ext_attr(attr);
return snprintf(buf, PAGE_SIZE, "%d\n", *(bool *)(ea->var)); return sysfs_emit(buf, "%d\n", *(bool *)(ea->var));
} }
EXPORT_SYMBOL_GPL(device_show_bool); EXPORT_SYMBOL_GPL(device_show_bool);
...@@ -1993,7 +1994,7 @@ static ssize_t online_show(struct device *dev, struct device_attribute *attr, ...@@ -1993,7 +1994,7 @@ static ssize_t online_show(struct device *dev, struct device_attribute *attr,
device_lock(dev); device_lock(dev);
val = !dev->offline; val = !dev->offline;
device_unlock(dev); device_unlock(dev);
return sprintf(buf, "%u\n", val); return sysfs_emit(buf, "%u\n", val);
} }
static ssize_t online_store(struct device *dev, struct device_attribute *attr, static ssize_t online_store(struct device *dev, struct device_attribute *attr,
......
...@@ -156,7 +156,7 @@ static ssize_t show_crash_notes(struct device *dev, struct device_attribute *att ...@@ -156,7 +156,7 @@ static ssize_t show_crash_notes(struct device *dev, struct device_attribute *att
* operation should be safe. No locking required. * operation should be safe. No locking required.
*/ */
addr = per_cpu_ptr_to_phys(per_cpu_ptr(crash_notes, cpunum)); addr = per_cpu_ptr_to_phys(per_cpu_ptr(crash_notes, cpunum));
rc = sprintf(buf, "%Lx\n", addr); rc = sysfs_emit(buf, "%Lx\n", addr);
return rc; return rc;
} }
static DEVICE_ATTR(crash_notes, 0400, show_crash_notes, NULL); static DEVICE_ATTR(crash_notes, 0400, show_crash_notes, NULL);
...@@ -167,7 +167,7 @@ static ssize_t show_crash_notes_size(struct device *dev, ...@@ -167,7 +167,7 @@ static ssize_t show_crash_notes_size(struct device *dev,
{ {
ssize_t rc; ssize_t rc;
rc = sprintf(buf, "%zu\n", sizeof(note_buf_t)); rc = sysfs_emit(buf, "%zu\n", sizeof(note_buf_t));
return rc; return rc;
} }
static DEVICE_ATTR(crash_notes_size, 0400, show_crash_notes_size, NULL); static DEVICE_ATTR(crash_notes_size, 0400, show_crash_notes_size, NULL);
...@@ -231,7 +231,7 @@ static struct cpu_attr cpu_attrs[] = { ...@@ -231,7 +231,7 @@ static struct cpu_attr cpu_attrs[] = {
static ssize_t print_cpus_kernel_max(struct device *dev, static ssize_t print_cpus_kernel_max(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
return sprintf(buf, "%d\n", NR_CPUS - 1); return sysfs_emit(buf, "%d\n", NR_CPUS - 1);
} }
static DEVICE_ATTR(kernel_max, 0444, print_cpus_kernel_max, NULL); static DEVICE_ATTR(kernel_max, 0444, print_cpus_kernel_max, NULL);
...@@ -279,7 +279,7 @@ static ssize_t print_cpus_isolated(struct device *dev, ...@@ -279,7 +279,7 @@ static ssize_t print_cpus_isolated(struct device *dev,
cpumask_andnot(isolated, cpu_possible_mask, cpumask_andnot(isolated, cpu_possible_mask,
housekeeping_cpumask(HK_FLAG_DOMAIN)); housekeeping_cpumask(HK_FLAG_DOMAIN));
n = sprintf(buf, "%*pbl\n", cpumask_pr_args(isolated)); n = sysfs_emit(buf, "%*pbl\n", cpumask_pr_args(isolated));
free_cpumask_var(isolated); free_cpumask_var(isolated);
...@@ -291,7 +291,7 @@ static DEVICE_ATTR(isolated, 0444, print_cpus_isolated, NULL); ...@@ -291,7 +291,7 @@ static DEVICE_ATTR(isolated, 0444, print_cpus_isolated, NULL);
static ssize_t print_cpus_nohz_full(struct device *dev, static ssize_t print_cpus_nohz_full(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
return sprintf(buf, "%*pbl\n", cpumask_pr_args(tick_nohz_full_mask)); return sysfs_emit(buf, "%*pbl\n", cpumask_pr_args(tick_nohz_full_mask));
} }
static DEVICE_ATTR(nohz_full, 0444, print_cpus_nohz_full, NULL); static DEVICE_ATTR(nohz_full, 0444, print_cpus_nohz_full, NULL);
#endif #endif
...@@ -323,7 +323,7 @@ static ssize_t print_cpu_modalias(struct device *dev, ...@@ -323,7 +323,7 @@ static ssize_t print_cpu_modalias(struct device *dev,
ssize_t n; ssize_t n;
u32 i; u32 i;
n = sprintf(buf, "cpu:type:" CPU_FEATURE_TYPEFMT ":feature:", n = sysfs_emit(buf, "cpu:type:" CPU_FEATURE_TYPEFMT ":feature:",
CPU_FEATURE_TYPEVAL); CPU_FEATURE_TYPEVAL);
for (i = 0; i < MAX_CPU_FEATURES; i++) for (i = 0; i < MAX_CPU_FEATURES; i++)
...@@ -516,56 +516,56 @@ static void __init cpu_dev_register_generic(void) ...@@ -516,56 +516,56 @@ static void __init cpu_dev_register_generic(void)
ssize_t __weak cpu_show_meltdown(struct device *dev, ssize_t __weak cpu_show_meltdown(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
return sprintf(buf, "Not affected\n"); return sysfs_emit(buf, "Not affected\n");
} }
ssize_t __weak cpu_show_spectre_v1(struct device *dev, ssize_t __weak cpu_show_spectre_v1(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
return sprintf(buf, "Not affected\n"); return sysfs_emit(buf, "Not affected\n");
} }
ssize_t __weak cpu_show_spectre_v2(struct device *dev, ssize_t __weak cpu_show_spectre_v2(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
return sprintf(buf, "Not affected\n"); return sysfs_emit(buf, "Not affected\n");
} }
ssize_t __weak cpu_show_spec_store_bypass(struct device *dev, ssize_t __weak cpu_show_spec_store_bypass(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
return sprintf(buf, "Not affected\n"); return sysfs_emit(buf, "Not affected\n");
} }
ssize_t __weak cpu_show_l1tf(struct device *dev, ssize_t __weak cpu_show_l1tf(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
return sprintf(buf, "Not affected\n"); return sysfs_emit(buf, "Not affected\n");
} }
ssize_t __weak cpu_show_mds(struct device *dev, ssize_t __weak cpu_show_mds(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
return sprintf(buf, "Not affected\n"); return sysfs_emit(buf, "Not affected\n");
} }
ssize_t __weak cpu_show_tsx_async_abort(struct device *dev, ssize_t __weak cpu_show_tsx_async_abort(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) char *buf)
{ {
return sprintf(buf, "Not affected\n"); return sysfs_emit(buf, "Not affected\n");
} }
ssize_t __weak cpu_show_itlb_multihit(struct device *dev, ssize_t __weak cpu_show_itlb_multihit(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
return sprintf(buf, "Not affected\n"); return sysfs_emit(buf, "Not affected\n");
} }
ssize_t __weak cpu_show_srbds(struct device *dev, ssize_t __weak cpu_show_srbds(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
return sprintf(buf, "Not affected\n"); return sysfs_emit(buf, "Not affected\n");
} }
static DEVICE_ATTR(meltdown, 0444, cpu_show_meltdown, NULL); static DEVICE_ATTR(meltdown, 0444, cpu_show_meltdown, NULL);
......
...@@ -486,7 +486,7 @@ static ssize_t state_synced_show(struct device *dev, ...@@ -486,7 +486,7 @@ static ssize_t state_synced_show(struct device *dev,
device_lock(dev); device_lock(dev);
val = dev->state_synced; val = dev->state_synced;
device_unlock(dev); device_unlock(dev);
return sprintf(buf, "%u\n", val); return sysfs_emit(buf, "%u\n", val);
} }
static DEVICE_ATTR_RO(state_synced); static DEVICE_ATTR_RO(state_synced);
......
...@@ -219,7 +219,7 @@ static ssize_t firmware_loading_show(struct device *dev, ...@@ -219,7 +219,7 @@ static ssize_t firmware_loading_show(struct device *dev,
loading = fw_sysfs_loading(fw_sysfs->fw_priv); loading = fw_sysfs_loading(fw_sysfs->fw_priv);
mutex_unlock(&fw_lock); mutex_unlock(&fw_lock);
return sprintf(buf, "%d\n", loading); return sysfs_emit(buf, "%d\n", loading);
} }
/** /**
......
...@@ -119,7 +119,7 @@ static ssize_t phys_index_show(struct device *dev, ...@@ -119,7 +119,7 @@ static ssize_t phys_index_show(struct device *dev,
unsigned long phys_index; unsigned long phys_index;
phys_index = mem->start_section_nr / sections_per_block; phys_index = mem->start_section_nr / sections_per_block;
return sprintf(buf, "%08lx\n", phys_index); return sysfs_emit(buf, "%08lx\n", phys_index);
} }
/* /*
...@@ -129,7 +129,7 @@ static ssize_t phys_index_show(struct device *dev, ...@@ -129,7 +129,7 @@ static ssize_t phys_index_show(struct device *dev,
static ssize_t removable_show(struct device *dev, struct device_attribute *attr, static ssize_t removable_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
return sprintf(buf, "%d\n", (int)IS_ENABLED(CONFIG_MEMORY_HOTREMOVE)); return sysfs_emit(buf, "%d\n", (int)IS_ENABLED(CONFIG_MEMORY_HOTREMOVE));
} }
/* /*
...@@ -147,16 +147,16 @@ static ssize_t state_show(struct device *dev, struct device_attribute *attr, ...@@ -147,16 +147,16 @@ static ssize_t state_show(struct device *dev, struct device_attribute *attr,
*/ */
switch (mem->state) { switch (mem->state) {
case MEM_ONLINE: case MEM_ONLINE:
len = sprintf(buf, "online\n"); len = sysfs_emit(buf, "online\n");
break; break;
case MEM_OFFLINE: case MEM_OFFLINE:
len = sprintf(buf, "offline\n"); len = sysfs_emit(buf, "offline\n");
break; break;
case MEM_GOING_OFFLINE: case MEM_GOING_OFFLINE:
len = sprintf(buf, "going-offline\n"); len = sysfs_emit(buf, "going-offline\n");
break; break;
default: default:
len = sprintf(buf, "ERROR-UNKNOWN-%ld\n", len = sysfs_emit(buf, "ERROR-UNKNOWN-%ld\n",
mem->state); mem->state);
WARN_ON(1); WARN_ON(1);
break; break;
...@@ -303,7 +303,7 @@ static ssize_t phys_device_show(struct device *dev, ...@@ -303,7 +303,7 @@ static ssize_t phys_device_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct memory_block *mem = to_memory_block(dev); struct memory_block *mem = to_memory_block(dev);
return sprintf(buf, "%d\n", mem->phys_device); return sysfs_emit(buf, "%d\n", mem->phys_device);
} }
#ifdef CONFIG_MEMORY_HOTREMOVE #ifdef CONFIG_MEMORY_HOTREMOVE
...@@ -341,7 +341,7 @@ static ssize_t valid_zones_show(struct device *dev, ...@@ -341,7 +341,7 @@ static ssize_t valid_zones_show(struct device *dev,
default_zone = test_pages_in_a_zone(start_pfn, default_zone = test_pages_in_a_zone(start_pfn,
start_pfn + nr_pages); start_pfn + nr_pages);
if (!default_zone) if (!default_zone)
return sprintf(buf, "none\n"); return sysfs_emit(buf, "none\n");
strcat(buf, default_zone->name); strcat(buf, default_zone->name);
goto out; goto out;
} }
...@@ -374,7 +374,7 @@ static DEVICE_ATTR_RO(removable); ...@@ -374,7 +374,7 @@ static DEVICE_ATTR_RO(removable);
static ssize_t block_size_bytes_show(struct device *dev, static ssize_t block_size_bytes_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
return sprintf(buf, "%lx\n", memory_block_size_bytes()); return sysfs_emit(buf, "%lx\n", memory_block_size_bytes());
} }
static DEVICE_ATTR_RO(block_size_bytes); static DEVICE_ATTR_RO(block_size_bytes);
...@@ -386,7 +386,7 @@ static DEVICE_ATTR_RO(block_size_bytes); ...@@ -386,7 +386,7 @@ static DEVICE_ATTR_RO(block_size_bytes);
static ssize_t auto_online_blocks_show(struct device *dev, static ssize_t auto_online_blocks_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
return sprintf(buf, "%s\n", return sysfs_emit(buf, "%s\n",
online_type_to_str[memhp_default_online_type]); online_type_to_str[memhp_default_online_type]);
} }
......
...@@ -370,7 +370,7 @@ static ssize_t node_read_meminfo(struct device *dev, ...@@ -370,7 +370,7 @@ static ssize_t node_read_meminfo(struct device *dev,
si_meminfo_node(&i, nid); si_meminfo_node(&i, nid);
sreclaimable = node_page_state_pages(pgdat, NR_SLAB_RECLAIMABLE_B); sreclaimable = node_page_state_pages(pgdat, NR_SLAB_RECLAIMABLE_B);
sunreclaimable = node_page_state_pages(pgdat, NR_SLAB_UNRECLAIMABLE_B); sunreclaimable = node_page_state_pages(pgdat, NR_SLAB_UNRECLAIMABLE_B);
n = sprintf(buf, n = sysfs_emit(buf,
"Node %d MemTotal: %8lu kB\n" "Node %d MemTotal: %8lu kB\n"
"Node %d MemFree: %8lu kB\n" "Node %d MemFree: %8lu kB\n"
"Node %d MemUsed: %8lu kB\n" "Node %d MemUsed: %8lu kB\n"
...@@ -477,7 +477,7 @@ static DEVICE_ATTR(meminfo, S_IRUGO, node_read_meminfo, NULL); ...@@ -477,7 +477,7 @@ static DEVICE_ATTR(meminfo, S_IRUGO, node_read_meminfo, NULL);
static ssize_t node_read_numastat(struct device *dev, static ssize_t node_read_numastat(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
return sprintf(buf, return sysfs_emit(buf,
"numa_hit %lu\n" "numa_hit %lu\n"
"numa_miss %lu\n" "numa_miss %lu\n"
"numa_foreign %lu\n" "numa_foreign %lu\n"
......
...@@ -1084,7 +1084,7 @@ static ssize_t driver_override_show(struct device *dev, ...@@ -1084,7 +1084,7 @@ static ssize_t driver_override_show(struct device *dev,
ssize_t len; ssize_t len;
device_lock(dev); device_lock(dev);
len = sprintf(buf, "%s\n", pdev->driver_override); len = sysfs_emit(buf, "%s\n", pdev->driver_override);
device_unlock(dev); device_unlock(dev);
return len; return len;
} }
...@@ -1093,7 +1093,7 @@ static DEVICE_ATTR_RW(driver_override); ...@@ -1093,7 +1093,7 @@ static DEVICE_ATTR_RW(driver_override);
static ssize_t numa_node_show(struct device *dev, static ssize_t numa_node_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
return sprintf(buf, "%d\n", dev_to_node(dev)); return sysfs_emit(buf, "%d\n", dev_to_node(dev));
} }
static DEVICE_ATTR_RO(numa_node); static DEVICE_ATTR_RO(numa_node);
......
...@@ -101,7 +101,7 @@ static const char ctrl_on[] = "on"; ...@@ -101,7 +101,7 @@ static const char ctrl_on[] = "on";
static ssize_t control_show(struct device *dev, struct device_attribute *attr, static ssize_t control_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
return sprintf(buf, "%s\n", return sysfs_emit(buf, "%s\n",
dev->power.runtime_auto ? ctrl_auto : ctrl_on); dev->power.runtime_auto ? ctrl_auto : ctrl_on);
} }
...@@ -127,7 +127,7 @@ static ssize_t runtime_active_time_show(struct device *dev, ...@@ -127,7 +127,7 @@ static ssize_t runtime_active_time_show(struct device *dev,
int ret; int ret;
u64 tmp = pm_runtime_active_time(dev); u64 tmp = pm_runtime_active_time(dev);
do_div(tmp, NSEC_PER_MSEC); do_div(tmp, NSEC_PER_MSEC);
ret = sprintf(buf, "%llu\n", tmp); ret = sysfs_emit(buf, "%llu\n", tmp);
return ret; return ret;
} }
...@@ -139,7 +139,7 @@ static ssize_t runtime_suspended_time_show(struct device *dev, ...@@ -139,7 +139,7 @@ static ssize_t runtime_suspended_time_show(struct device *dev,
int ret; int ret;
u64 tmp = pm_runtime_suspended_time(dev); u64 tmp = pm_runtime_suspended_time(dev);
do_div(tmp, NSEC_PER_MSEC); do_div(tmp, NSEC_PER_MSEC);
ret = sprintf(buf, "%llu\n", tmp); ret = sysfs_emit(buf, "%llu\n", tmp);
return ret; return ret;
} }
...@@ -172,7 +172,7 @@ static ssize_t runtime_status_show(struct device *dev, ...@@ -172,7 +172,7 @@ static ssize_t runtime_status_show(struct device *dev,
return -EIO; return -EIO;
} }
} }
return sprintf(buf, p); return sysfs_emit(buf, p);
} }
static DEVICE_ATTR_RO(runtime_status); static DEVICE_ATTR_RO(runtime_status);
...@@ -182,7 +182,7 @@ static ssize_t autosuspend_delay_ms_show(struct device *dev, ...@@ -182,7 +182,7 @@ static ssize_t autosuspend_delay_ms_show(struct device *dev,
{ {
if (!dev->power.use_autosuspend) if (!dev->power.use_autosuspend)
return -EIO; return -EIO;
return sprintf(buf, "%d\n", dev->power.autosuspend_delay); return sysfs_emit(buf, "%d\n", dev->power.autosuspend_delay);
} }
static ssize_t autosuspend_delay_ms_store(struct device *dev, static ssize_t autosuspend_delay_ms_store(struct device *dev,
...@@ -211,11 +211,11 @@ static ssize_t pm_qos_resume_latency_us_show(struct device *dev, ...@@ -211,11 +211,11 @@ static ssize_t pm_qos_resume_latency_us_show(struct device *dev,
s32 value = dev_pm_qos_requested_resume_latency(dev); s32 value = dev_pm_qos_requested_resume_latency(dev);
if (value == 0) if (value == 0)
return sprintf(buf, "n/a\n"); return sysfs_emit(buf, "n/a\n");
if (value == PM_QOS_RESUME_LATENCY_NO_CONSTRAINT) if (value == PM_QOS_RESUME_LATENCY_NO_CONSTRAINT)
value = 0; value = 0;
return sprintf(buf, "%d\n", value); return sysfs_emit(buf, "%d\n", value);
} }
static ssize_t pm_qos_resume_latency_us_store(struct device *dev, static ssize_t pm_qos_resume_latency_us_store(struct device *dev,
...@@ -255,11 +255,11 @@ static ssize_t pm_qos_latency_tolerance_us_show(struct device *dev, ...@@ -255,11 +255,11 @@ static ssize_t pm_qos_latency_tolerance_us_show(struct device *dev,
s32 value = dev_pm_qos_get_user_latency_tolerance(dev); s32 value = dev_pm_qos_get_user_latency_tolerance(dev);
if (value < 0) if (value < 0)
return sprintf(buf, "auto\n"); return sysfs_emit(buf, "auto\n");
if (value == PM_QOS_LATENCY_ANY) if (value == PM_QOS_LATENCY_ANY)
return sprintf(buf, "any\n"); return sysfs_emit(buf, "any\n");
return sprintf(buf, "%d\n", value); return sysfs_emit(buf, "%d\n", value);
} }
static ssize_t pm_qos_latency_tolerance_us_store(struct device *dev, static ssize_t pm_qos_latency_tolerance_us_store(struct device *dev,
...@@ -291,7 +291,7 @@ static ssize_t pm_qos_no_power_off_show(struct device *dev, ...@@ -291,7 +291,7 @@ static ssize_t pm_qos_no_power_off_show(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) char *buf)
{ {
return sprintf(buf, "%d\n", !!(dev_pm_qos_requested_flags(dev) return sysfs_emit(buf, "%d\n", !!(dev_pm_qos_requested_flags(dev)
& PM_QOS_FLAG_NO_POWER_OFF)); & PM_QOS_FLAG_NO_POWER_OFF));
} }
...@@ -320,7 +320,7 @@ static const char _disabled[] = "disabled"; ...@@ -320,7 +320,7 @@ static const char _disabled[] = "disabled";
static ssize_t wakeup_show(struct device *dev, struct device_attribute *attr, static ssize_t wakeup_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
return sprintf(buf, "%s\n", device_can_wakeup(dev) return sysfs_emit(buf, "%s\n", device_can_wakeup(dev)
? (device_may_wakeup(dev) ? _enabled : _disabled) ? (device_may_wakeup(dev) ? _enabled : _disabled)
: ""); : "");
} }
...@@ -522,7 +522,7 @@ static inline int dpm_sysfs_wakeup_change_owner(struct device *dev, kuid_t kuid, ...@@ -522,7 +522,7 @@ static inline int dpm_sysfs_wakeup_change_owner(struct device *dev, kuid_t kuid,
static ssize_t runtime_usage_show(struct device *dev, static ssize_t runtime_usage_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
return sprintf(buf, "%d\n", atomic_read(&dev->power.usage_count)); return sysfs_emit(buf, "%d\n", atomic_read(&dev->power.usage_count));
} }
static DEVICE_ATTR_RO(runtime_usage); static DEVICE_ATTR_RO(runtime_usage);
...@@ -530,7 +530,7 @@ static ssize_t runtime_active_kids_show(struct device *dev, ...@@ -530,7 +530,7 @@ static ssize_t runtime_active_kids_show(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) char *buf)
{ {
return sprintf(buf, "%d\n", dev->power.ignore_children ? return sysfs_emit(buf, "%d\n", dev->power.ignore_children ?
0 : atomic_read(&dev->power.child_count)); 0 : atomic_read(&dev->power.child_count));
} }
static DEVICE_ATTR_RO(runtime_active_kids); static DEVICE_ATTR_RO(runtime_active_kids);
...@@ -539,12 +539,12 @@ static ssize_t runtime_enabled_show(struct device *dev, ...@@ -539,12 +539,12 @@ static ssize_t runtime_enabled_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
if (dev->power.disable_depth && (dev->power.runtime_auto == false)) if (dev->power.disable_depth && (dev->power.runtime_auto == false))
return sprintf(buf, "disabled & forbidden\n"); return sysfs_emit(buf, "disabled & forbidden\n");
if (dev->power.disable_depth) if (dev->power.disable_depth)
return sprintf(buf, "disabled\n"); return sysfs_emit(buf, "disabled\n");
if (dev->power.runtime_auto == false) if (dev->power.runtime_auto == false)
return sprintf(buf, "forbidden\n"); return sysfs_emit(buf, "forbidden\n");
return sprintf(buf, "enabled\n"); return sysfs_emit(buf, "enabled\n");
} }
static DEVICE_ATTR_RO(runtime_enabled); static DEVICE_ATTR_RO(runtime_enabled);
...@@ -552,7 +552,7 @@ static DEVICE_ATTR_RO(runtime_enabled); ...@@ -552,7 +552,7 @@ static DEVICE_ATTR_RO(runtime_enabled);
static ssize_t async_show(struct device *dev, struct device_attribute *attr, static ssize_t async_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
return sprintf(buf, "%s\n", return sysfs_emit(buf, "%s\n",
device_async_suspend_enabled(dev) ? device_async_suspend_enabled(dev) ?
_enabled : _disabled); _enabled : _disabled);
} }
......
...@@ -42,7 +42,7 @@ static ssize_t active_time_ms_show(struct device *dev, ...@@ -42,7 +42,7 @@ static ssize_t active_time_ms_show(struct device *dev,
ktime_t active_time = ktime_t active_time =
ws->active ? ktime_sub(ktime_get(), ws->last_time) : 0; ws->active ? ktime_sub(ktime_get(), ws->last_time) : 0;
return sprintf(buf, "%lld\n", ktime_to_ms(active_time)); return sysfs_emit(buf, "%lld\n", ktime_to_ms(active_time));
} }
static DEVICE_ATTR_RO(active_time_ms); static DEVICE_ATTR_RO(active_time_ms);
...@@ -57,7 +57,7 @@ static ssize_t total_time_ms_show(struct device *dev, ...@@ -57,7 +57,7 @@ static ssize_t total_time_ms_show(struct device *dev,
active_time = ktime_sub(ktime_get(), ws->last_time); active_time = ktime_sub(ktime_get(), ws->last_time);
total_time = ktime_add(total_time, active_time); total_time = ktime_add(total_time, active_time);
} }
return sprintf(buf, "%lld\n", ktime_to_ms(total_time)); return sysfs_emit(buf, "%lld\n", ktime_to_ms(total_time));
} }
static DEVICE_ATTR_RO(total_time_ms); static DEVICE_ATTR_RO(total_time_ms);
...@@ -73,7 +73,7 @@ static ssize_t max_time_ms_show(struct device *dev, ...@@ -73,7 +73,7 @@ static ssize_t max_time_ms_show(struct device *dev,
if (active_time > max_time) if (active_time > max_time)
max_time = active_time; max_time = active_time;
} }
return sprintf(buf, "%lld\n", ktime_to_ms(max_time)); return sysfs_emit(buf, "%lld\n", ktime_to_ms(max_time));
} }
static DEVICE_ATTR_RO(max_time_ms); static DEVICE_ATTR_RO(max_time_ms);
...@@ -82,7 +82,7 @@ static ssize_t last_change_ms_show(struct device *dev, ...@@ -82,7 +82,7 @@ static ssize_t last_change_ms_show(struct device *dev,
{ {
struct wakeup_source *ws = dev_get_drvdata(dev); struct wakeup_source *ws = dev_get_drvdata(dev);
return sprintf(buf, "%lld\n", ktime_to_ms(ws->last_time)); return sysfs_emit(buf, "%lld\n", ktime_to_ms(ws->last_time));
} }
static DEVICE_ATTR_RO(last_change_ms); static DEVICE_ATTR_RO(last_change_ms);
...@@ -91,7 +91,7 @@ static ssize_t name_show(struct device *dev, struct device_attribute *attr, ...@@ -91,7 +91,7 @@ static ssize_t name_show(struct device *dev, struct device_attribute *attr,
{ {
struct wakeup_source *ws = dev_get_drvdata(dev); struct wakeup_source *ws = dev_get_drvdata(dev);
return sprintf(buf, "%s\n", ws->name); return sysfs_emit(buf, "%s\n", ws->name);
} }
static DEVICE_ATTR_RO(name); static DEVICE_ATTR_RO(name);
...@@ -106,7 +106,7 @@ static ssize_t prevent_suspend_time_ms_show(struct device *dev, ...@@ -106,7 +106,7 @@ static ssize_t prevent_suspend_time_ms_show(struct device *dev,
prevent_sleep_time = ktime_add(prevent_sleep_time, prevent_sleep_time = ktime_add(prevent_sleep_time,
ktime_sub(ktime_get(), ws->start_prevent_time)); ktime_sub(ktime_get(), ws->start_prevent_time));
} }
return sprintf(buf, "%lld\n", ktime_to_ms(prevent_sleep_time)); return sysfs_emit(buf, "%lld\n", ktime_to_ms(prevent_sleep_time));
} }
static DEVICE_ATTR_RO(prevent_suspend_time_ms); static DEVICE_ATTR_RO(prevent_suspend_time_ms);
......
...@@ -76,15 +76,15 @@ static ssize_t soc_info_get(struct device *dev, ...@@ -76,15 +76,15 @@ static ssize_t soc_info_get(struct device *dev,
struct soc_device *soc_dev = container_of(dev, struct soc_device, dev); struct soc_device *soc_dev = container_of(dev, struct soc_device, dev);
if (attr == &dev_attr_machine) if (attr == &dev_attr_machine)
return sprintf(buf, "%s\n", soc_dev->attr->machine); return sysfs_emit(buf, "%s\n", soc_dev->attr->machine);
if (attr == &dev_attr_family) if (attr == &dev_attr_family)
return sprintf(buf, "%s\n", soc_dev->attr->family); return sysfs_emit(buf, "%s\n", soc_dev->attr->family);
if (attr == &dev_attr_revision) if (attr == &dev_attr_revision)
return sprintf(buf, "%s\n", soc_dev->attr->revision); return sysfs_emit(buf, "%s\n", soc_dev->attr->revision);
if (attr == &dev_attr_serial_number) if (attr == &dev_attr_serial_number)
return sprintf(buf, "%s\n", soc_dev->attr->serial_number); return sysfs_emit(buf, "%s\n", soc_dev->attr->serial_number);
if (attr == &dev_attr_soc_id) if (attr == &dev_attr_soc_id)
return sprintf(buf, "%s\n", soc_dev->attr->soc_id); return sysfs_emit(buf, "%s\n", soc_dev->attr->soc_id);
return -EINVAL; return -EINVAL;
......
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