mirror of https://github.com/torvalds/linux.git
ACPI: bus: change the prototype for acpi_get_physical_device_location
It generally is not OK to use acpi_status and/or AE_ error codes without CONFIG_ACPI and they really only should be used in drivers/acpi/ (and not everywhere in there for that matter). So acpi_get_physical_device_location() needs to be redefined to return something different from acpi_status (preferably bool) in order to be used in !CONFIG_ACPI code. Suggested-by: Rafael J. Wysocki <rafael@kernel.org> Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> Link: https://patch.msgid.link/20241216-fix-ipu-v5-1-3d6b35ddce7b@chromium.org Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
parent
7349678b84
commit
79f237bae9
|
|
@ -624,8 +624,7 @@ static void init_crs_csi2_swnodes(struct crs_csi2 *csi2)
|
||||||
if (!fwnode_property_present(adev_fwnode, "rotation")) {
|
if (!fwnode_property_present(adev_fwnode, "rotation")) {
|
||||||
struct acpi_pld_info *pld;
|
struct acpi_pld_info *pld;
|
||||||
|
|
||||||
status = acpi_get_physical_device_location(handle, &pld);
|
if (acpi_get_physical_device_location(handle, &pld)) {
|
||||||
if (ACPI_SUCCESS(status)) {
|
|
||||||
swnodes->dev_props[NEXT_PROPERTY(prop_index, DEV_ROTATION)] =
|
swnodes->dev_props[NEXT_PROPERTY(prop_index, DEV_ROTATION)] =
|
||||||
PROPERTY_ENTRY_U32("rotation",
|
PROPERTY_ENTRY_U32("rotation",
|
||||||
pld->rotation * 45U);
|
pld->rotation * 45U);
|
||||||
|
|
|
||||||
|
|
@ -723,10 +723,8 @@ int acpi_tie_acpi_dev(struct acpi_device *adev)
|
||||||
static void acpi_store_pld_crc(struct acpi_device *adev)
|
static void acpi_store_pld_crc(struct acpi_device *adev)
|
||||||
{
|
{
|
||||||
struct acpi_pld_info *pld;
|
struct acpi_pld_info *pld;
|
||||||
acpi_status status;
|
|
||||||
|
|
||||||
status = acpi_get_physical_device_location(adev->handle, &pld);
|
if (!acpi_get_physical_device_location(adev->handle, &pld))
|
||||||
if (ACPI_FAILURE(status))
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
adev->pld_crc = crc32(~0, pld, sizeof(*pld));
|
adev->pld_crc = crc32(~0, pld, sizeof(*pld));
|
||||||
|
|
|
||||||
|
|
@ -494,7 +494,7 @@ bool acpi_device_dep(acpi_handle target, acpi_handle match)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(acpi_device_dep);
|
EXPORT_SYMBOL_GPL(acpi_device_dep);
|
||||||
|
|
||||||
acpi_status
|
bool
|
||||||
acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld_info **pld)
|
acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld_info **pld)
|
||||||
{
|
{
|
||||||
acpi_status status;
|
acpi_status status;
|
||||||
|
|
@ -502,9 +502,8 @@ acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld_info **pld
|
||||||
union acpi_object *output;
|
union acpi_object *output;
|
||||||
|
|
||||||
status = acpi_evaluate_object(handle, "_PLD", NULL, &buffer);
|
status = acpi_evaluate_object(handle, "_PLD", NULL, &buffer);
|
||||||
|
|
||||||
if (ACPI_FAILURE(status))
|
if (ACPI_FAILURE(status))
|
||||||
return status;
|
return false;
|
||||||
|
|
||||||
output = buffer.pointer;
|
output = buffer.pointer;
|
||||||
|
|
||||||
|
|
@ -523,7 +522,7 @@ acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld_info **pld
|
||||||
|
|
||||||
out:
|
out:
|
||||||
kfree(buffer.pointer);
|
kfree(buffer.pointer);
|
||||||
return status;
|
return ACPI_SUCCESS(status);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(acpi_get_physical_device_location);
|
EXPORT_SYMBOL(acpi_get_physical_device_location);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,13 +13,11 @@
|
||||||
bool dev_add_physical_location(struct device *dev)
|
bool dev_add_physical_location(struct device *dev)
|
||||||
{
|
{
|
||||||
struct acpi_pld_info *pld;
|
struct acpi_pld_info *pld;
|
||||||
acpi_status status;
|
|
||||||
|
|
||||||
if (!has_acpi_companion(dev))
|
if (!has_acpi_companion(dev))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
status = acpi_get_physical_device_location(ACPI_HANDLE(dev), &pld);
|
if (!acpi_get_physical_device_location(ACPI_HANDLE(dev), &pld))
|
||||||
if (ACPI_FAILURE(status))
|
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
dev->physical_location =
|
dev->physical_location =
|
||||||
|
|
|
||||||
|
|
@ -259,12 +259,12 @@ static enum v4l2_fwnode_orientation ipu_bridge_parse_orientation(struct acpi_dev
|
||||||
{
|
{
|
||||||
enum v4l2_fwnode_orientation orientation;
|
enum v4l2_fwnode_orientation orientation;
|
||||||
struct acpi_pld_info *pld = NULL;
|
struct acpi_pld_info *pld = NULL;
|
||||||
acpi_status status = AE_ERROR;
|
bool status = false;
|
||||||
|
|
||||||
#if IS_ENABLED(CONFIG_ACPI)
|
#if IS_ENABLED(CONFIG_ACPI)
|
||||||
status = acpi_get_physical_device_location(adev->handle, &pld);
|
status = acpi_get_physical_device_location(adev->handle, &pld);
|
||||||
#endif
|
#endif
|
||||||
if (ACPI_FAILURE(status)) {
|
if (!status) {
|
||||||
dev_warn(ADEV_DEV(adev), "_PLD call failed, using default orientation\n");
|
dev_warn(ADEV_DEV(adev), "_PLD call failed, using default orientation\n");
|
||||||
return V4L2_FWNODE_ORIENTATION_EXTERNAL;
|
return V4L2_FWNODE_ORIENTATION_EXTERNAL;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -213,8 +213,7 @@ usb_acpi_get_connect_type(struct usb_port *port_dev, acpi_handle *handle)
|
||||||
* no connectable, the port would be not used.
|
* no connectable, the port would be not used.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
status = acpi_get_physical_device_location(handle, &pld);
|
if (acpi_get_physical_device_location(handle, &pld) && pld)
|
||||||
if (ACPI_SUCCESS(status) && pld)
|
|
||||||
port_dev->location = USB_ACPI_LOCATION_VALID |
|
port_dev->location = USB_ACPI_LOCATION_VALID |
|
||||||
pld->group_token << 8 | pld->group_position;
|
pld->group_token << 8 | pld->group_position;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@ acpi_status
|
||||||
acpi_evaluate_ost(acpi_handle handle, u32 source_event, u32 status_code,
|
acpi_evaluate_ost(acpi_handle handle, u32 source_event, u32 status_code,
|
||||||
struct acpi_buffer *status_buf);
|
struct acpi_buffer *status_buf);
|
||||||
|
|
||||||
acpi_status
|
bool
|
||||||
acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld_info **pld);
|
acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld_info **pld);
|
||||||
|
|
||||||
bool acpi_has_method(acpi_handle handle, char *name);
|
bool acpi_has_method(acpi_handle handle, char *name);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue