| Message ID | 1380524558-25188-1-git-send-email-wangyijing@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Mon, Sep 30, 2013 at 1:02 AM, Yijing Wang <wangyijing@huawei.com> wrote: > Local_cpus_show() and local_cpulist_show() are almost the same, > introudce a new helper function pci_dev_show_local_cpu() to simplify > code. > > Signed-off-by: Yijing Wang <wangyijing@huawei.com> Applied to pci/misc, thanks! Bjorn > --- > drivers/pci/pci-sysfs.c | 32 +++++++++++++++----------------- > 1 files changed, 15 insertions(+), 17 deletions(-) > > diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c > index 7128cfd..3b41405 100644 > --- 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); > } > > /* > -- > 1.7.1 > > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 7128cfd..3b41405 100644 --- 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); } /*
Local_cpus_show() and local_cpulist_show() are almost the same, introudce a new helper function pci_dev_show_local_cpu() to simplify code. Signed-off-by: Yijing Wang <wangyijing@huawei.com> --- drivers/pci/pci-sysfs.c | 32 +++++++++++++++----------------- 1 files changed, 15 insertions(+), 17 deletions(-)