[libata] Prefer SCSI_SENSE_BUFFERSIZE to sizeof()

[linux-2.6-omap-h63xx.git] / drivers / base / topology.c

diff --git a/drivers/base/topology.c b/drivers/base/topology.c
index 3d12b85b09623a9498627fa2889fbccf2156f27d..e1d3ad4db2f04355631efd8120946c07313789c8 100644 (file)
--- a/drivers/base/topology.c
+++ b/drivers/base/topology.c
@@ -94,28 +94,18 @@ static struct attribute_group topology_attr_group = {
        .name = "topology"
 };
 
-static cpumask_t topology_dev_map = CPU_MASK_NONE;
-
 /* Add/Remove cpu_topology interface for CPU device */
 static int __cpuinit topology_add_dev(unsigned int cpu)
 {
-       int rc;
        struct sys_device *sys_dev = get_cpu_sysdev(cpu);
 
-       rc = sysfs_create_group(&sys_dev->kobj, &topology_attr_group);
-       if (!rc)
-               cpu_set(cpu, topology_dev_map);
-       return rc;
+       return sysfs_create_group(&sys_dev->kobj, &topology_attr_group);
 }
 
-#ifdef CONFIG_HOTPLUG_CPU
 static void __cpuinit topology_remove_dev(unsigned int cpu)
 {
        struct sys_device *sys_dev = get_cpu_sysdev(cpu);
 
-       if (!cpu_isset(cpu, topology_dev_map))
-               return;
-       cpu_clear(cpu, topology_dev_map);
        sysfs_remove_group(&sys_dev->kobj, &topology_attr_group);
 }
 
@@ -127,16 +117,18 @@ static int __cpuinit topology_cpu_callback(struct notifier_block *nfb,
 
        switch (action) {
        case CPU_UP_PREPARE:
+       case CPU_UP_PREPARE_FROZEN:
                rc = topology_add_dev(cpu);
                break;
        case CPU_UP_CANCELED:
+       case CPU_UP_CANCELED_FROZEN:
        case CPU_DEAD:
+       case CPU_DEAD_FROZEN:
                topology_remove_dev(cpu);
                break;
        }
        return rc ? NOTIFY_BAD : NOTIFY_OK;
 }
-#endif
 
 static int __cpuinit topology_sysfs_init(void)
 {