powerpc: use %*pb[l] to print bitmaps including cpumasks and nodemasks

printk and friends can now format bitmaps using '%*pb[l]'.  cpumask
and nodemask also provide cpumask_pr_args() and nodemask_pr_args()
respectively which can be used to generate the two printf arguments
necessary to format the specified cpu/nodemask.

* Spurious if (len > 1) test dropped from shared_cpu_map_show().

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

3 files changed, 10 insertions, 18 deletions

diff --git a/arch/powerpc/kernel/cacheinfo.c b/arch/powerpc/kernel/cacheinfo.c
index 40198d50b4c2..ae77b7e59889 100644
--- a/arch/powerpc/kernel/cacheinfo.c
+++ b/arch/powerpc/kernel/cacheinfo.c
@@ -607,19 +607,16 @@ static ssize_t shared_cpu_map_show(struct kobject *k, struct kobj_attribute *att
 {
         struct cache_index_dir *index;
         struct cache *cache;
-        int len;
-        int n = 0;
+        int ret;
 
         index = kobj_to_cache_index_dir(k);
         cache = index->cache;
-        len = PAGE_SIZE - 2;
 
-        if (len > 1) {
-                n = cpumask_scnprintf(buf, len, &cache->shared_cpu_map);
-                buf[n++] = '\n';
-                buf[n] = '\0';
-        }
-        return n;
+        ret = scnprintf(buf, PAGE_SIZE - 1, "%*pb\n",
+                        cpumask_pr_args(&cache->shared_cpu_map));
+        buf[ret++] = '\n';
+        buf[ret] = '\0';
+        return ret;
 }
 
 static struct kobj_attribute cache_shared_cpu_map_attr =
diff --git a/arch/powerpc/sysdev/xics/ics-opal.c b/arch/powerpc/sysdev/xics/ics-opal.c
index 4ba554ec8eaf..68c7e5cc98e0 100644
--- a/arch/powerpc/sysdev/xics/ics-opal.c
+++ b/arch/powerpc/sysdev/xics/ics-opal.c
@@ -131,10 +131,8 @@ static int ics_opal_set_affinity(struct irq_data *d,
 
         wanted_server = xics_get_irq_server(d->irq, cpumask, 1);
         if (wanted_server < 0) {
-                char cpulist[128];
-                cpumask_scnprintf(cpulist, sizeof(cpulist), cpumask);
-                pr_warning("%s: No online cpus in the mask %s for irq %d\n",
-                           __func__, cpulist, d->irq);
+                pr_warning("%s: No online cpus in the mask %*pb for irq %d\n",
+                           __func__, cpumask_pr_args(cpumask), d->irq);
                 return -1;
         }
         server = ics_opal_mangle_server(wanted_server);
diff --git a/arch/powerpc/sysdev/xics/ics-rtas.c b/arch/powerpc/sysdev/xics/ics-rtas.c
index bc81335b2cbc..0af97deb83f3 100644
--- a/arch/powerpc/sysdev/xics/ics-rtas.c
+++ b/arch/powerpc/sysdev/xics/ics-rtas.c
@@ -140,11 +140,8 @@ static int ics_rtas_set_affinity(struct irq_data *d,
 
         irq_server = xics_get_irq_server(d->irq, cpumask, 1);
         if (irq_server == -1) {
-                char cpulist[128];
-                cpumask_scnprintf(cpulist, sizeof(cpulist), cpumask);
-                printk(KERN_WARNING
-                        "%s: No online cpus in the mask %s for irq %d\n",
-                        __func__, cpulist, d->irq);
+                pr_warning("%s: No online cpus in the mask %*pb for irq %d\n",
+                           __func__, cpumask_pr_args(cpumask), d->irq);
                 return -1;
         }