diff options
| author |   Sakari Ailus <sakari.ailus@linux.intel.com> | 2017-05-24 17:53:54 +0300 |
|---|---|---|
| committer |   Rob Herring <robh@kernel.org> | 2017-06-01 08:50:47 -0500 |
| commit | debd3a3b27c76c65a7d032b6f01710e6a6d555ab (patch) | |
| tree | bd872b01ad8b51c6a69eaf18e2bac10375c9c20c /include/linux/of.h | |
| parent | of: Move OF property and graph API from base.c to property.c (diff) | |
| download | linux-dev-debd3a3b27c76c65a7d032b6f01710e6a6d555ab.tar.xz linux-dev-debd3a3b27c76c65a7d032b6f01710e6a6d555ab.zip | |
of: Make of_fwnode_handle() safer
On the expense of a little bit more complexity in the of_fwnode_handle()
macro, make the macro result in NULL in case its argument is NULL while
still referencing it only once.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'include/linux/of.h')
| -rw-r--r-- | include/linux/of.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/of.h b/include/linux/of.h index 50fcdb54087f..f05c87f0c495 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -159,7 +159,13 @@ static inline struct device_node *to_of_node(struct fwnode_handle *fwnode) container_of(fwnode, struct device_node, fwnode) : NULL; } -#define of_fwnode_handle(node) (&(node)->fwnode) +#define of_fwnode_handle(node) \ + ({ \ + typeof(node) __of_fwnode_handle_node = (node); \ + \ + __of_fwnode_handle_node ? \ + &__of_fwnode_handle_node->fwnode : NULL; \ + }) static inline bool of_have_populated_dt(void) { |