PCI: Add pci_dev_show_local_cpu() to simplify code

local_cpus_show() and local_cpulist_show() are almost the same.
This adds a new helper function, pci_dev_show_local_cpu(), to simplify
code.

The same strategy is already used by cpuaffinity_show() and
cpulistaffinity_show().

Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 7128cfdd64aa9d31c8628be30e7c65b33396dbfb..d9252dd89ea9d61a43d399bd912c1cf5f155989d 100644 (file)
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -74,9 +74,11 @@ static ssize_t broken_parity_status_store(struct device *dev,
        return count;
 }
 
-static ssize_t local_cpus_show(struct device *dev,
-                       struct device_attribute *attr, char *buf)
-{              
+static ssize_t pci_dev_show_local_cpu(struct device *dev,
+               int type,
+               struct device_attribute *attr,
+               char *buf)
+{
        const struct cpumask *mask;
        int len;
 
@@ -86,29 +88,25 @@ static ssize_t local_cpus_show(struct device *dev,
 #else
        mask = cpumask_of_pcibus(to_pci_dev(dev)->bus);
 #endif
-       len = cpumask_scnprintf(buf, PAGE_SIZE-2, mask);
+       len = type ?
+               cpumask_scnprintf(buf, PAGE_SIZE-2, mask) :
+               cpulist_scnprintf(buf, PAGE_SIZE-2, mask);
+
        buf[len++] = '\n';
        buf[len] = '\0';
        return len;
 }
 
+static ssize_t local_cpus_show(struct device *dev,
+                       struct device_attribute *attr, char *buf)
+{
+       return pci_dev_show_local_cpu(dev, 1, attr, buf);
+}
 
 static ssize_t local_cpulist_show(struct device *dev,
                        struct device_attribute *attr, char *buf)
 {
-       const struct cpumask *mask;
-       int len;
-
-#ifdef CONFIG_NUMA
-       mask = (dev_to_node(dev) == -1) ? cpu_online_mask :
-                                         cpumask_of_node(dev_to_node(dev));
-#else
-       mask = cpumask_of_pcibus(to_pci_dev(dev)->bus);
-#endif
-       len = cpulist_scnprintf(buf, PAGE_SIZE-2, mask);
-       buf[len++] = '\n';
-       buf[len] = '\0';
-       return len;
+       return pci_dev_show_local_cpu(dev, 0, attr, buf);
 }
 
 /*