Skip to content

Commit

Permalink
ACPI: processor: use .notify method instead of installing handler dir…
Browse files Browse the repository at this point in the history
…ectly

This patch adds a .notify() method.  The presence of .notify() causes
Linux/ACPI to manage event handlers and notify handlers on our behalf,
so we don't have to install and remove them ourselves.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
CC: Zhang Rui <rui.zhang@intel.com>
CC: Zhao Yakui <yakui.zhao@intel.com>
CC: Venki Pallipadi <venkatesh.pallipadi@intel.com>
CC: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Bjorn Helgaas authored and lenb committed Apr 5, 2009
1 parent 373cfc3 commit 7ec0a72
Showing 1 changed file with 4 additions and 15 deletions.
19 changes: 4 additions & 15 deletions drivers/acpi/processor_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ static int acpi_processor_add(struct acpi_device *device);
static int acpi_processor_start(struct acpi_device *device);
static int acpi_processor_remove(struct acpi_device *device, int type);
static int acpi_processor_info_open_fs(struct inode *inode, struct file *file);
static void acpi_processor_notify(acpi_handle handle, u32 event, void *data);
static void acpi_processor_notify(struct acpi_device *device, u32 event);
static acpi_status acpi_processor_hotadd_init(acpi_handle handle, int *p_cpu);
static int acpi_processor_handle_eject(struct acpi_processor *pr);

Expand All @@ -104,6 +104,7 @@ static struct acpi_driver acpi_processor_driver = {
.start = acpi_processor_start,
.suspend = acpi_processor_suspend,
.resume = acpi_processor_resume,
.notify = acpi_processor_notify,
},
};

Expand Down Expand Up @@ -691,7 +692,6 @@ static DEFINE_PER_CPU(void *, processor_device_array);
static int __cpuinit acpi_processor_start(struct acpi_device *device)
{
int result = 0;
acpi_status status = AE_OK;
struct acpi_processor *pr;
struct sys_device *sysdev;

Expand Down Expand Up @@ -728,9 +728,6 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
if (sysfs_create_link(&device->dev.kobj, &sysdev->kobj, "sysdev"))
return -EFAULT;

status = acpi_install_notify_handler(pr->handle, ACPI_DEVICE_NOTIFY,
acpi_processor_notify, pr);

/* _PDC call should be done before doing anything else (if reqd.). */
arch_acpi_processor_init_pdc(pr);
acpi_processor_set_pdc(pr);
Expand Down Expand Up @@ -776,18 +773,14 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
return result;
}

static void acpi_processor_notify(acpi_handle handle, u32 event, void *data)
static void acpi_processor_notify(struct acpi_device *device, u32 event)
{
struct acpi_processor *pr = data;
struct acpi_device *device = NULL;
struct acpi_processor *pr = acpi_driver_data(device);
int saved;

if (!pr)
return;

if (acpi_bus_get_device(pr->handle, &device))
return;

switch (event) {
case ACPI_PROCESSOR_NOTIFY_PERFORMANCE:
saved = pr->performance_platform_limit;
Expand Down Expand Up @@ -866,7 +859,6 @@ static int acpi_processor_add(struct acpi_device *device)

static int acpi_processor_remove(struct acpi_device *device, int type)
{
acpi_status status = AE_OK;
struct acpi_processor *pr = NULL;


Expand All @@ -885,9 +877,6 @@ static int acpi_processor_remove(struct acpi_device *device, int type)

acpi_processor_power_exit(pr, device);

status = acpi_remove_notify_handler(pr->handle, ACPI_DEVICE_NOTIFY,
acpi_processor_notify);

sysfs_remove_link(&device->dev.kobj, "sysdev");

acpi_processor_remove_fs(device);
Expand Down

0 comments on commit 7ec0a72

Please sign in to comment.