cpumask: remove the now-obsoleted pcibus_to_cpumask() This replaces the two callers and deletes the arch definitions. Signed-off-by: Rusty Russell --- arch/alpha/include/asm/topology.h | 1 - arch/ia64/include/asm/topology.h | 5 ----- arch/mips/include/asm/mach-ip27/topology.h | 1 - arch/sh/include/asm/topology.h | 4 ---- arch/sparc/include/asm/topology_64.h | 5 ----- arch/x86/include/asm/pci.h | 5 ----- arch/x86/include/asm/topology.h | 1 - drivers/pci/pci-sysfs.c | 12 ++++++------ drivers/pci/probe.c | 8 ++++---- include/asm-generic/topology.h | 7 ------- 10 files changed, 10 insertions(+), 39 deletions(-) diff -r 5bb875dff5bb arch/alpha/include/asm/topology.h --- a/arch/alpha/include/asm/topology.h Fri Nov 07 23:58:05 2008 +1100 +++ b/arch/alpha/include/asm/topology.h Fri Nov 07 23:58:27 2008 +1100 @@ -55,7 +55,6 @@ static const struct cpumask *cpumask_of_ return &node_to_cpumask_map[node]; } -#define pcibus_to_cpumask(bus) (cpu_online_map) #define cpumask_of_pcibus(bus) (cpu_online_mask) #endif /* !CONFIG_NUMA */ diff -r 5bb875dff5bb arch/ia64/include/asm/topology.h --- a/arch/ia64/include/asm/topology.h Fri Nov 07 23:58:05 2008 +1100 +++ b/arch/ia64/include/asm/topology.h Fri Nov 07 23:58:27 2008 +1100 @@ -117,11 +117,6 @@ void build_cpu_to_node_map(void); extern void arch_fix_phys_package_id(int num, u32 slot); -#define pcibus_to_cpumask(bus) (pcibus_to_node(bus) == -1 ? \ - CPU_MASK_ALL : \ - node_to_cpumask(pcibus_to_node(bus)) \ - ) - #define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ? \ cpu_all_mask : \ cpumask_from_node(pcibus_to_node(bus))) diff -r 5bb875dff5bb arch/mips/include/asm/mach-ip27/topology.h --- a/arch/mips/include/asm/mach-ip27/topology.h Fri Nov 07 23:58:05 2008 +1100 +++ b/arch/mips/include/asm/mach-ip27/topology.h Fri Nov 07 23:58:27 2008 +1100 @@ -30,7 +30,6 @@ struct pci_bus; struct pci_bus; extern int pcibus_to_node(struct pci_bus *); -#define pcibus_to_cpumask(bus) (cpu_online_map) #define cpumask_of_pcibus(bus) (cpu_online_mask) extern unsigned char __node_distances[MAX_COMPACT_NODES][MAX_COMPACT_NODES]; diff -r 5bb875dff5bb arch/sh/include/asm/topology.h --- a/arch/sh/include/asm/topology.h Fri Nov 07 23:58:05 2008 +1100 +++ b/arch/sh/include/asm/topology.h Fri Nov 07 23:58:27 2008 +1100 @@ -37,10 +37,6 @@ #define node_to_first_cpu(node) ((void)(node),0) #define pcibus_to_node(bus) ((void)(bus), -1) -#define pcibus_to_cpumask(bus) (pcibus_to_node(bus) == -1 ? \ - CPU_MASK_ALL : \ - node_to_cpumask(pcibus_to_node(bus)) \ - ) #endif #include diff -r 5bb875dff5bb arch/sparc/include/asm/topology_64.h --- a/arch/sparc/include/asm/topology_64.h Fri Nov 07 23:58:05 2008 +1100 +++ b/arch/sparc/include/asm/topology_64.h Fri Nov 07 23:58:27 2008 +1100 @@ -40,11 +40,6 @@ static inline int pcibus_to_node(struct } #endif -#define pcibus_to_cpumask(bus) \ - (pcibus_to_node(bus) == -1 ? \ - CPU_MASK_ALL : \ - node_to_cpumask(pcibus_to_node(bus))) - #define SD_NODE_INIT (struct sched_domain) { \ .min_interval = 8, \ .max_interval = 32, \ diff -r 5bb875dff5bb arch/x86/include/asm/pci.h --- a/arch/x86/include/asm/pci.h Fri Nov 07 23:58:05 2008 +1100 +++ b/arch/x86/include/asm/pci.h Fri Nov 07 23:58:27 2008 +1100 @@ -105,11 +105,6 @@ static inline int __pcibus_to_node(const return sd->node; } -static inline cpumask_t __pcibus_to_cpumask(struct pci_bus *bus) -{ - return node_to_cpumask(__pcibus_to_node(bus)); -} - static inline const struct cpumask * cpumask_of_pcibus(const struct pci_bus *bus) { diff -r 5bb875dff5bb arch/x86/include/asm/topology.h --- a/arch/x86/include/asm/topology.h Fri Nov 07 23:58:05 2008 +1100 +++ b/arch/x86/include/asm/topology.h Fri Nov 07 23:58:27 2008 +1100 @@ -141,7 +141,6 @@ static inline cpumask_t node_to_cpumask( #define parent_node(node) (node) #define pcibus_to_node(bus) __pcibus_to_node(bus) -#define pcibus_to_cpumask(bus) __pcibus_to_cpumask(bus) #ifdef CONFIG_X86_32 extern unsigned long node_start_pfn[]; diff -r 5bb875dff5bb drivers/pci/pci-sysfs.c --- a/drivers/pci/pci-sysfs.c Fri Nov 07 23:58:05 2008 +1100 +++ b/drivers/pci/pci-sysfs.c Fri Nov 07 23:58:27 2008 +1100 @@ -70,11 +70,11 @@ static ssize_t local_cpus_show(struct de static ssize_t local_cpus_show(struct device *dev, struct device_attribute *attr, char *buf) { - cpumask_t mask; + const struct cpumask *mask; int len; - mask = pcibus_to_cpumask(to_pci_dev(dev)->bus); - len = cpumask_scnprintf(buf, PAGE_SIZE-2, &mask); + mask = cpumask_of_pcibus(to_pci_dev(dev)->bus); + len = cpumask_scnprintf(buf, PAGE_SIZE-2, mask); buf[len++] = '\n'; buf[len] = '\0'; return len; @@ -84,11 +84,11 @@ static ssize_t local_cpulist_show(struct static ssize_t local_cpulist_show(struct device *dev, struct device_attribute *attr, char *buf) { - cpumask_t mask; + const struct cpumask *mask; int len; - mask = pcibus_to_cpumask(to_pci_dev(dev)->bus); - len = cpulist_scnprintf(buf, PAGE_SIZE-2, &mask); + mask = cpumask_of_pcibus(to_pci_dev(dev)->bus); + len = cpulist_scnprintf(buf, PAGE_SIZE-2, mask); buf[len++] = '\n'; buf[len] = '\0'; return len; diff -r 5bb875dff5bb drivers/pci/probe.c --- a/drivers/pci/probe.c Fri Nov 07 23:58:05 2008 +1100 +++ b/drivers/pci/probe.c Fri Nov 07 23:58:27 2008 +1100 @@ -51,12 +51,12 @@ static ssize_t pci_bus_show_cpuaffinity( char *buf) { int ret; - cpumask_t cpumask; + const struct cpumask *cpumask; - cpumask = pcibus_to_cpumask(to_pci_bus(dev)); + cpumask = cpumask_of_pcibus(to_pci_bus(dev)); ret = type? - cpulist_scnprintf(buf, PAGE_SIZE-2, &cpumask) : - cpumask_scnprintf(buf, PAGE_SIZE-2, &cpumask); + cpulist_scnprintf(buf, PAGE_SIZE-2, cpumask) : + cpumask_scnprintf(buf, PAGE_SIZE-2, cpumask); buf[ret++] = '\n'; buf[ret] = '\0'; return ret; diff -r 5bb875dff5bb include/asm-generic/topology.h --- a/include/asm-generic/topology.h Fri Nov 07 23:58:05 2008 +1100 +++ b/include/asm-generic/topology.h Fri Nov 07 23:58:27 2008 +1100 @@ -50,13 +50,6 @@ #define pcibus_to_node(bus) ((void)(bus), -1) #endif -#ifndef pcibus_to_cpumask -#define pcibus_to_cpumask(bus) (pcibus_to_node(bus) == -1 ? \ - CPU_MASK_ALL : \ - node_to_cpumask(pcibus_to_node(bus)) \ - ) -#endif - #ifndef cpumask_of_pcibus #define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ? \ cpu_all_mask : \