Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 700b8422 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ACPI: Drop acpi_evaluate_hotplug_ost() and ACPI_HOTPLUG_OST 



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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarToshi Kani <toshi.kani@hp.com>
parent 2bd74d91

drivers/acpi/bus.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

}



/* --------------------------------------------------------------------------

drivers/acpi/scan.c

+5 −5
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ 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_evaluate_ost(adev->handle, ACPI_NOTIFY_EJECT_REQUEST,

				  ACPI_OST_SC_EJECT_IN_PROGRESS, NULL);

		return acpi_scan_hot_remove(adev);

	}
@@ -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,7 +572,7 @@ 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_evaluate_ost(acpi_device->handle, ACPI_OST_EC_OSPM_EJECT,

			  ACPI_OST_SC_NON_SPECIFIC_FAILURE, NULL);

	return status == AE_NO_MEMORY ? -ENOMEM : -EAGAIN;

}

drivers/acpi/utils.c

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/xen/xen-acpi-cpuhotplug.c

+1 −1
Original line number Diff line number Diff line
@@ -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();

drivers/xen/xen-acpi-memhotplug.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}