mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'devprop-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Browse Source 
Pull device properties framework updates from Rafael Wysocki:
 "These unify device properties access in some pieces of code and make
  related changes.

  Specifics:

   - Handle device properties with software node API in the ACPI IORT
     table parsing code (Heikki Krogerus).

   - Unify of_node access in the common device properties code, constify
     the acpi_dma_supported() argument pointer and fix up CONFIG_ACPI=n
     stubs of some functions related to device properties (Andy
     Shevchenko)"

* tag 'devprop-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  device property: Unify access to of_node
  ACPI: scan: Constify acpi_dma_supported() helper function
  ACPI: property: Constify stubs for CONFIG_ACPI=n case
  ACPI: IORT: Handle device properties with software node API
  device property: Retrieve fwnode from of_node via accessor
This commit is contained in:
Linus Torvalds
2021-06-29 14:04:37 -07:00
parent 72ad9f9d21 fb38f314fb
commit 349a2d52ff
6 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/linux/acpi.h
View File

@@ -766,7 +766,7 @@ static inline bool is_acpi_device_node(const struct fwnode_handle *fwnode)
return false;
}
static inline struct acpi_device *to_acpi_device_node(struct fwnode_handle *fwnode)
static inline struct acpi_device *to_acpi_device_node(const struct fwnode_handle *fwnode)
{
return NULL;
}
@@ -776,12 +776,12 @@ static inline bool is_acpi_data_node(const struct fwnode_handle *fwnode)
return false;
}
static inline struct acpi_data_node *to_acpi_data_node(struct fwnode_handle *fwnode)
static inline struct acpi_data_node *to_acpi_data_node(const struct fwnode_handle *fwnode)
{
return NULL;
}
static inline bool acpi_data_node_match(struct fwnode_handle *fwnode,
static inline bool acpi_data_node_match(const struct fwnode_handle *fwnode,
const char *name)
{
return false;
@@ -912,7 +912,7 @@ acpi_create_platform_device(struct acpi_device *adev,
return NULL;
}
static inline bool acpi_dma_supported(struct acpi_device *adev)
static inline bool acpi_dma_supported(const struct acpi_device *adev)
{
return false;
}