Commit ea6be461 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fix from Rafael Wysocki:
 "Make the empty stubs of some helper functions used when CONFIG_ACPI is
  not set actually match those functions (Andy Shevchenko)"

* tag 'acpi-5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: bus: Constify is_acpi_node() and friends (part 2)
parents fc2c8d0a ff70784a

include/linux/acpi.h

+3 −3
Original line number Diff line number Diff line
@@ -746,12 +746,12 @@ acpi_dev_get_first_match_dev(const char *hid, const char *uid, s64 hrv) 


static inline void acpi_dev_put(struct acpi_device *adev) {}



static inline bool is_acpi_node(struct fwnode_handle *fwnode)

static inline bool is_acpi_node(const struct fwnode_handle *fwnode)

{

	return false;

}



static inline bool is_acpi_device_node(struct fwnode_handle *fwnode)

static inline bool is_acpi_device_node(const struct fwnode_handle *fwnode)

{

	return false;

}
@@ -761,7 +761,7 @@ static inline struct acpi_device *to_acpi_device_node(struct fwnode_handle *fwno 
	return NULL;

}



static inline bool is_acpi_data_node(struct fwnode_handle *fwnode)

static inline bool is_acpi_data_node(const struct fwnode_handle *fwnode)

{

	return false;

}