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>
This commit is contained in:
Yijing Wang 2013-09-30 15:02:38 +08:00 committed by Bjorn Helgaas
parent 135530d584
commit c489f5fbb1
1 changed files with 20 additions and 22 deletions

View File

@ -74,27 +74,10 @@ static ssize_t broken_parity_status_store(struct device *dev,
return count; return count;
} }
static ssize_t local_cpus_show(struct device *dev, static ssize_t pci_dev_show_local_cpu(struct device *dev,
struct device_attribute *attr, char *buf) int type,
{ struct device_attribute *attr,
const struct cpumask *mask; char *buf)
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 = cpumask_scnprintf(buf, PAGE_SIZE-2, mask);
buf[len++] = '\n';
buf[len] = '\0';
return len;
}
static ssize_t local_cpulist_show(struct device *dev,
struct device_attribute *attr, char *buf)
{ {
const struct cpumask *mask; const struct cpumask *mask;
int len; int len;
@ -105,12 +88,27 @@ static ssize_t local_cpulist_show(struct device *dev,
#else #else
mask = cpumask_of_pcibus(to_pci_dev(dev)->bus); mask = cpumask_of_pcibus(to_pci_dev(dev)->bus);
#endif #endif
len = cpulist_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++] = '\n';
buf[len] = '\0'; buf[len] = '\0';
return len; 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)
{
return pci_dev_show_local_cpu(dev, 0, attr, buf);
}
/* /*
* PCI Bus Class Devices * PCI Bus Class Devices
*/ */