1 files changed, 2 insertions, 20 deletions

diff --git a/drivers/base/topology.c b/drivers/base/topology.c
index be7c1fb7c0c9..f7c353843ddf 100644
--- a/drivers/base/topology.c
+++ b/drivers/base/topology.c
@@ -42,29 +42,11 @@ static ssize_t show_##name(struct device *dev,			\
         return sprintf(buf, "%d\n", topology_##name(dev->id));  \
 }
 
-#if defined(topology_thread_cpumask) || defined(topology_core_cpumask) || \
-    defined(topology_book_cpumask)
-static ssize_t show_cpumap(int type, const struct cpumask *mask, char *buf)
-{
-        ptrdiff_t len = PTR_ALIGN(buf + PAGE_SIZE - 1, PAGE_SIZE) - buf;
-        int n = 0;
-
-        if (len > 1) {
-                n = type?
-                        cpulist_scnprintf(buf, len-2, mask) :
-                        cpumask_scnprintf(buf, len-2, mask);
-                buf[n++] = '\n';
-                buf[n] = '\0';
-        }
-        return n;
-}
-#endif
-
 #define define_siblings_show_map(name)                                  \
 static ssize_t show_##name(struct device *dev,                          \
                            struct device_attribute *attr, char *buf)    \
 {                                                                       \
-        return show_cpumap(0, topology_##name(dev->id), buf);           \
+        return cpumap_print_to_pagebuf(false, buf, topology_##name(dev->id));\
 }
 
 #define define_siblings_show_list(name)                                 \
@@ -72,7 +54,7 @@ static ssize_t show_##name##_list(struct device *dev,			\
                                   struct device_attribute *attr,        \
                                   char *buf)                            \
 {                                                                       \
-        return show_cpumap(1, topology_##name(dev->id), buf);           \
+        return cpumap_print_to_pagebuf(true, buf, topology_##name(dev->id));\
 }
 
 #define define_siblings_show_func(name)         \