kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ACPI: Drop acpi_evaluate_hotplug_ost() and ACPI_HOTPLUG_OST

Browse source 
Replace acpi_evaluate_hotplug_ost() with acpi_evaluate_ost()
everywhere and drop the ACPI_HOTPLUG_OST symbol so that hotplug
_OST is supported unconditionally.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Toshi Kani <toshi.kani@hp.com>
This commit is contained in:
Rafael J. Wysocki 2014-02-21 01:07:17 +01:00
parent 2bd74d91b1
commit 700b8422fb
6 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/acpi/bus.c
View file

@ -311,9 +311,7 @@ static void acpi_bus_osc_support(void)
capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PPC_OST_SUPPORT;
#endif
#ifdef ACPI_HOTPLUG_OST
capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_HOTPLUG_OST_SUPPORT;
#endif
if (!ghes_disable)
capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_APEI_SUPPORT;
@ -410,7 +408,7 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data)
return;
err:
acpi_evaluate_hotplug_ost(handle, type, ost_code, NULL);
acpi_evaluate_ost(handle, type, ost_code, NULL);
}
/* --------------------------------------------------------------------------

10
drivers/acpi/scan.c
View file

@ -463,8 +463,8 @@ static int acpi_generic_hotplug_event(struct acpi_device *adev, u32 type)
dev_info(&adev->dev, "Eject disabled\n");
return -EPERM;
}
acpi_evaluate_hotplug_ost(adev->handle, ACPI_NOTIFY_EJECT_REQUEST,
ACPI_OST_SC_EJECT_IN_PROGRESS, NULL);
acpi_evaluate_ost(adev->handle, ACPI_NOTIFY_EJECT_REQUEST,
ACPI_OST_SC_EJECT_IN_PROGRESS, NULL);
return acpi_scan_hot_remove(adev);
}
return -EINVAL;
@ -512,7 +512,7 @@ void acpi_device_hotplug(void *data, u32 src)
ost_code = ACPI_OST_SC_SUCCESS;
err_out:
acpi_evaluate_hotplug_ost(adev->handle, src, ost_code, NULL);
acpi_evaluate_ost(adev->handle, src, ost_code, NULL);
out:
acpi_bus_put_acpi_device(adev);
@ -572,8 +572,8 @@ acpi_eject_store(struct device *d, struct device_attribute *attr,
return count;
put_device(&acpi_device->dev);
acpi_evaluate_hotplug_ost(acpi_device->handle, ACPI_OST_EC_OSPM_EJECT,
ACPI_OST_SC_NON_SPECIFIC_FAILURE, NULL);
acpi_evaluate_ost(acpi_device->handle, ACPI_OST_EC_OSPM_EJECT,
ACPI_OST_SC_NON_SPECIFIC_FAILURE, NULL);
return status == AE_NO_MEMORY ? -ENOMEM : -EAGAIN;
}

2
drivers/acpi/utils.c
View file

@ -422,7 +422,7 @@ out:
EXPORT_SYMBOL(acpi_get_physical_device_location);
/**
* acpi_evaluate_hotplug_ost: Evaluate _OST for hotplug operations
* acpi_evaluate_ost: Evaluate _OST for hotplug operations
* @handle: ACPI device handle
* @source_event: source event code
* @status_code: status code

2
drivers/xen/xen-acpi-cpuhotplug.c
View file

@ -313,7 +313,7 @@ static void acpi_processor_hotplug_notify(acpi_handle handle,
goto out;
}
(void) acpi_evaluate_hotplug_ost(handle, event, ost_code, NULL);
(void) acpi_evaluate_ost(handle, event, ost_code, NULL);
out:
acpi_scan_lock_release();

2
drivers/xen/xen-acpi-memhotplug.c
View file

@ -285,7 +285,7 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)
return;
}
(void) acpi_evaluate_hotplug_ost(handle, event, ost_code, NULL);
(void) acpi_evaluate_ost(handle, event, ost_code, NULL);
return;
}

8
include/acpi/acpi_bus.h
View file

@ -51,14 +51,6 @@ acpi_evaluate_reference(acpi_handle handle,
acpi_status
acpi_evaluate_ost(acpi_handle handle, u32 source_event, u32 status_code,
struct acpi_buffer *status_buf);
#ifdef ACPI_HOTPLUG_OST
#define acpi_evaluate_hotplug_ost acpi_evaluate_ost
#else
static inline acpi_status
acpi_evaluate_hotplug_ost(acpi_handle handle, u32 source_event,
u32 status_code, struct acpi_buffer *status_buf)
{ return AE_OK; }
#endif
acpi_status
acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld_info **pld);