nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

ACPI: Constify acpi_bus helper functions, switch to macros

Browse source 
Constify arguments to is_acpi_node(), is_acpi_device_node(),
is_acpi_static_node() and acpi_data_node_match(). Make
to_acpi_device_node() and to_acpi_data_node() macros that can cope with
const and non-const arguments.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Sakari Ailus 2017-07-21 14:39:33 +03:00 committed by Rafael J. Wysocki
parent 01c1da2897
commit 8b9d680258
1 changed files with 23 additions and 15 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

38
include/acpi/acpi_bus.h
View file

@ -399,43 +399,51 @@ extern const struct fwnode_operations acpi_device_fwnode_ops;
extern const struct fwnode_operations acpi_data_fwnode_ops; extern const struct fwnode_operations acpi_data_fwnode_ops;
extern const struct fwnode_operations acpi_static_fwnode_ops; extern const struct fwnode_operations acpi_static_fwnode_ops;
static inline bool is_acpi_node(struct fwnode_handle *fwnode) static inline bool is_acpi_node(const struct fwnode_handle *fwnode)
{ {
return !IS_ERR_OR_NULL(fwnode) && return !IS_ERR_OR_NULL(fwnode) &&
(fwnode->ops == &acpi_device_fwnode_ops (fwnode->ops == &acpi_device_fwnode_ops
|| fwnode->ops == &acpi_data_fwnode_ops); || fwnode->ops == &acpi_data_fwnode_ops);
} }
static inline bool is_acpi_device_node(struct fwnode_handle *fwnode) static inline bool is_acpi_device_node(const struct fwnode_handle *fwnode)
{ {
return !IS_ERR_OR_NULL(fwnode) && return !IS_ERR_OR_NULL(fwnode) &&
fwnode->ops == &acpi_device_fwnode_ops; fwnode->ops == &acpi_device_fwnode_ops;
} }
static inline struct acpi_device *to_acpi_device_node(struct fwnode_handle *fwnode) #define to_acpi_device_node(__fwnode) \
{ ({ \
return is_acpi_device_node(fwnode) ? typeof(__fwnode) __to_acpi_device_node_fwnode = __fwnode; \
container_of(fwnode, struct acpi_device, fwnode) : NULL; \
} is_acpi_device_node(__to_acpi_device_node_fwnode) ? \
container_of(__to_acpi_device_node_fwnode, \
struct acpi_device, fwnode) : \
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 !IS_ERR_OR_NULL(fwnode) && fwnode->ops == &acpi_data_fwnode_ops; return !IS_ERR_OR_NULL(fwnode) && fwnode->ops == &acpi_data_fwnode_ops;
} }
static inline struct acpi_data_node *to_acpi_data_node(struct fwnode_handle *fwnode) #define to_acpi_data_node(__fwnode) \
{ ({ \
return is_acpi_data_node(fwnode) ? typeof(__fwnode) __to_acpi_data_node_fwnode = __fwnode; \
container_of(fwnode, struct acpi_data_node, fwnode) : NULL; \
} is_acpi_data_node(__to_acpi_data_node_fwnode) ? \
container_of(__to_acpi_data_node_fwnode, \
struct acpi_data_node, fwnode) : \
NULL; \
})
static inline bool is_acpi_static_node(struct fwnode_handle *fwnode) static inline bool is_acpi_static_node(const struct fwnode_handle *fwnode)
{ {
return !IS_ERR_OR_NULL(fwnode) && return !IS_ERR_OR_NULL(fwnode) &&
fwnode->ops == &acpi_static_fwnode_ops; fwnode->ops == &acpi_static_fwnode_ops;
} }
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) const char *name)
{ {
return is_acpi_data_node(fwnode) ? return is_acpi_data_node(fwnode) ?