diff options
Diffstat (limited to 'include/acpi/acpi_bus.h')
| -rw-r--r-- | include/acpi/acpi_bus.h | 18 | 
1 files changed, 4 insertions, 14 deletions
| diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index dedf9d789166..fa1505292f6c 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -399,17 +399,12 @@ extern const struct fwnode_operations acpi_device_fwnode_ops;  extern const struct fwnode_operations acpi_data_fwnode_ops;  extern const struct fwnode_operations acpi_static_fwnode_ops; +bool is_acpi_device_node(const struct fwnode_handle *fwnode); +bool is_acpi_data_node(const struct fwnode_handle *fwnode); +  static inline bool is_acpi_node(const struct fwnode_handle *fwnode)  { -	return !IS_ERR_OR_NULL(fwnode) && -		(fwnode->ops == &acpi_device_fwnode_ops -		 || fwnode->ops == &acpi_data_fwnode_ops); -} - -static inline bool is_acpi_device_node(const struct fwnode_handle *fwnode) -{ -	return !IS_ERR_OR_NULL(fwnode) && -		fwnode->ops == &acpi_device_fwnode_ops; +	return (is_acpi_device_node(fwnode) || is_acpi_data_node(fwnode));  }  #define to_acpi_device_node(__fwnode)					\ @@ -422,11 +417,6 @@ static inline bool is_acpi_device_node(const struct fwnode_handle *fwnode)  			NULL;						\  	}) -static inline bool is_acpi_data_node(const struct fwnode_handle *fwnode) -{ -	return !IS_ERR_OR_NULL(fwnode) && fwnode->ops == &acpi_data_fwnode_ops; -} -  #define to_acpi_data_node(__fwnode)					\  	({								\  		typeof(__fwnode) __to_acpi_data_node_fwnode = __fwnode;	\ |