[PATCH] of: Drop redundant check in linker section OF match table
From: Mukesh Ojha
Date: Wed Mar 20 2019 - 06:49:15 EST
Existing check of `fn` against NULL inside OF match table
is redundant. Remove the check.
Signed-off-by: Mukesh Ojha <mojha@xxxxxxxxxxxxxx>
Cc: Rob Herring <robh@xxxxxxxxxx>
Cc: Frank Rowand <frowand.list@xxxxxxxxx>
Cc: Pantelis Antoniou <pantelis.antoniou@xxxxxxxxxxxx>
Cc: devicetree@xxxxxxxxxxxxxxx
---
include/linux/of.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/of.h b/include/linux/of.h
index e240992..b86c00a 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -1283,13 +1283,13 @@ static inline int of_get_available_child_count(const struct device_node *np)
static const struct of_device_id __of_table_##name \
__used __section(__##table##_of_table) \
= { .compatible = compat, \
- .data = (fn == (fn_type)NULL) ? fn : fn }
+ .data = fn }
#else
#define _OF_DECLARE(table, name, compat, fn, fn_type) \
static const struct of_device_id __of_table_##name \
__attribute__((unused)) \
= { .compatible = compat, \
- .data = (fn == (fn_type)NULL) ? fn : fn }
+ .data = fn }
#endif
typedef int (*of_init_fn_2)(struct device_node *, struct device_node *);
--
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center,
Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project