drivers/base/cpu: Simplify s*nprintf() usages (847e3386) · Commits · 戴 / test

drivers/base/cpu.c

+4 −9

Original line number	Diff line number	Diff line
		@@ -231,8 +231,7 @@ static struct cpu_attr cpu_attrs[] = {
		static ssize_t print_cpus_kernel_max(struct device *dev,
		struct device_attribute attr, char buf)
		{
		int n = snprintf(buf, PAGE_SIZE-2, "%d\n", NR_CPUS - 1);
		return n;
		return sprintf(buf, "%d\n", NR_CPUS - 1);
		}
		static DEVICE_ATTR(kernel_max, 0444, print_cpus_kernel_max, NULL);

		@@ -272,7 +271,7 @@ static DEVICE_ATTR(offline, 0444, print_cpus_offline, NULL);
		static ssize_t print_cpus_isolated(struct device *dev,
		struct device_attribute attr, char buf)
		{
		int n = 0, len = PAGE_SIZE-2;
		int n;
		cpumask_var_t isolated;

		if (!alloc_cpumask_var(&isolated, GFP_KERNEL))
		@@ -280,7 +279,7 @@ static ssize_t print_cpus_isolated(struct device *dev,

		cpumask_andnot(isolated, cpu_possible_mask,
		housekeeping_cpumask(HK_FLAG_DOMAIN));
		n = scnprintf(buf, len, "%*pbl\n", cpumask_pr_args(isolated));
		n = sprintf(buf, "%*pbl\n", cpumask_pr_args(isolated));

		free_cpumask_var(isolated);

		@@ -292,11 +291,7 @@ static DEVICE_ATTR(isolated, 0444, print_cpus_isolated, NULL);
		static ssize_t print_cpus_nohz_full(struct device *dev,
		struct device_attribute attr, char buf)
		{
		int n = 0, len = PAGE_SIZE-2;

		n = scnprintf(buf, len, "%*pbl\n", cpumask_pr_args(tick_nohz_full_mask));

		return n;
		return sprintf(buf, "%*pbl\n", cpumask_pr_args(tick_nohz_full_mask));
		}
		static DEVICE_ATTR(nohz_full, 0444, print_cpus_nohz_full, NULL);
		#endif