Commit ddcd62d8 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

ACPI: processor: move acpi_processor_start() after acpi_processor_add() 



Move acpi_processor_start() to just after acpi_processor_add().
A subsequent patch will merge them.

Code movement only; no functional change.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
CC: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
CC: Zhao Yakui <yakui.zhao@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent d4e05261

drivers/acpi/processor_core.c

+84 −84
Original line number Diff line number Diff line
@@ -698,6 +698,90 @@ static int acpi_processor_get_info(struct acpi_device *device) 


static DEFINE_PER_CPU(void *, processor_device_array);



static void acpi_processor_notify(struct acpi_device *device, u32 event)

{

	struct acpi_processor *pr = acpi_driver_data(device);

	int saved;



	if (!pr)

		return;



	switch (event) {

	case ACPI_PROCESSOR_NOTIFY_PERFORMANCE:

		saved = pr->performance_platform_limit;

		acpi_processor_ppc_has_changed(pr);

		if (saved == pr->performance_platform_limit)

			break;

		acpi_bus_generate_proc_event(device, event,

					pr->performance_platform_limit);

		acpi_bus_generate_netlink_event(device->pnp.device_class,

						  dev_name(&device->dev), event,

						  pr->performance_platform_limit);

		break;

	case ACPI_PROCESSOR_NOTIFY_POWER:

		acpi_processor_cst_has_changed(pr);

		acpi_bus_generate_proc_event(device, event, 0);

		acpi_bus_generate_netlink_event(device->pnp.device_class,

						  dev_name(&device->dev), event, 0);

		break;

	case ACPI_PROCESSOR_NOTIFY_THROTTLING:

		acpi_processor_tstate_has_changed(pr);

		acpi_bus_generate_proc_event(device, event, 0);

		acpi_bus_generate_netlink_event(device->pnp.device_class,

						  dev_name(&device->dev), event, 0);

	default:

		ACPI_DEBUG_PRINT((ACPI_DB_INFO,

				  "Unsupported event [0x%x]\n", event));

		break;

	}



	return;

}



static int acpi_cpu_soft_notify(struct notifier_block *nfb,

		unsigned long action, void *hcpu)

{

	unsigned int cpu = (unsigned long)hcpu;

	struct acpi_processor *pr = per_cpu(processors, cpu);



	if (action == CPU_ONLINE && pr) {

		acpi_processor_ppc_has_changed(pr);

		acpi_processor_cst_has_changed(pr);

		acpi_processor_tstate_has_changed(pr);

	}

	return NOTIFY_OK;

}



static struct notifier_block acpi_cpu_notifier =

{

	    .notifier_call = acpi_cpu_soft_notify,

};



static int acpi_processor_add(struct acpi_device *device)

{

	struct acpi_processor *pr = NULL;





	if (!device)

		return -EINVAL;



	pr = kzalloc(sizeof(struct acpi_processor), GFP_KERNEL);

	if (!pr)

		return -ENOMEM;



	if (!zalloc_cpumask_var(&pr->throttling.shared_cpu_map, GFP_KERNEL)) {

		kfree(pr);

		return -ENOMEM;

	}



	pr->handle = device->handle;

	strcpy(acpi_device_name(device), ACPI_PROCESSOR_DEVICE_NAME);

	strcpy(acpi_device_class(device), ACPI_PROCESSOR_CLASS);

	device->driver_data = pr;



	return 0;

}



static int __cpuinit acpi_processor_start(struct acpi_device *device)

{

	int result = 0;
@@ -799,90 +883,6 @@ err_remove_fs: 
	return result;

}



static void acpi_processor_notify(struct acpi_device *device, u32 event)

{

	struct acpi_processor *pr = acpi_driver_data(device);

	int saved;



	if (!pr)

		return;



	switch (event) {

	case ACPI_PROCESSOR_NOTIFY_PERFORMANCE:

		saved = pr->performance_platform_limit;

		acpi_processor_ppc_has_changed(pr);

		if (saved == pr->performance_platform_limit)

			break;

		acpi_bus_generate_proc_event(device, event,

					pr->performance_platform_limit);

		acpi_bus_generate_netlink_event(device->pnp.device_class,

						  dev_name(&device->dev), event,

						  pr->performance_platform_limit);

		break;

	case ACPI_PROCESSOR_NOTIFY_POWER:

		acpi_processor_cst_has_changed(pr);

		acpi_bus_generate_proc_event(device, event, 0);

		acpi_bus_generate_netlink_event(device->pnp.device_class,

						  dev_name(&device->dev), event, 0);

		break;

	case ACPI_PROCESSOR_NOTIFY_THROTTLING:

		acpi_processor_tstate_has_changed(pr);

		acpi_bus_generate_proc_event(device, event, 0);

		acpi_bus_generate_netlink_event(device->pnp.device_class,

						  dev_name(&device->dev), event, 0);

	default:

		ACPI_DEBUG_PRINT((ACPI_DB_INFO,

				  "Unsupported event [0x%x]\n", event));

		break;

	}



	return;

}



static int acpi_cpu_soft_notify(struct notifier_block *nfb,

		unsigned long action, void *hcpu)

{

	unsigned int cpu = (unsigned long)hcpu;

	struct acpi_processor *pr = per_cpu(processors, cpu);



	if (action == CPU_ONLINE && pr) {

		acpi_processor_ppc_has_changed(pr);

		acpi_processor_cst_has_changed(pr);

		acpi_processor_tstate_has_changed(pr);

	}

	return NOTIFY_OK;

}



static struct notifier_block acpi_cpu_notifier =

{

	    .notifier_call = acpi_cpu_soft_notify,

};



static int acpi_processor_add(struct acpi_device *device)

{

	struct acpi_processor *pr = NULL;





	if (!device)

		return -EINVAL;



	pr = kzalloc(sizeof(struct acpi_processor), GFP_KERNEL);

	if (!pr)

		return -ENOMEM;



	if (!zalloc_cpumask_var(&pr->throttling.shared_cpu_map, GFP_KERNEL)) {

		kfree(pr);

		return -ENOMEM;

	}



	pr->handle = device->handle;

	strcpy(acpi_device_name(device), ACPI_PROCESSOR_DEVICE_NAME);

	strcpy(acpi_device_class(device), ACPI_PROCESSOR_CLASS);

	device->driver_data = pr;



	return 0;

}



static int acpi_processor_remove(struct acpi_device *device, int type)

{

	struct acpi_processor *pr = NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE