From: Zijun Hu <quic_zijuhu@xxxxxxxxxxx> Do not expose of_modalias() since it has no external callers. Signed-off-by: Zijun Hu <quic_zijuhu@xxxxxxxxxxx> --- drivers/of/module.c | 2 ++ drivers/of/of_private.h | 2 ++ include/linux/of.h | 6 ------ 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/of/module.c b/drivers/of/module.c index 03a2b1b381e5b353b6699dac183c03186afb0486..6dd670f7e4fe68b6a8f4b30a81064a1b8e4a0644 100644 --- a/drivers/of/module.c +++ b/drivers/of/module.c @@ -8,6 +8,8 @@ #include <linux/slab.h> #include <linux/string.h> +#include "of_private.h" + /* * of_modalias - get MODALIAS string value for a OF device node * @np: the OF device node diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h index 3433ccd330e84fd3a4b54638e0e922069757c8f0..5facb6ff63cce46205fbe3969ae2e9f7858ac9bd 100644 --- a/drivers/of/of_private.h +++ b/drivers/of/of_private.h @@ -150,6 +150,8 @@ extern void __of_detach_node(struct device_node *np); extern void __of_sysfs_remove_bin_file(struct device_node *np, const struct property *prop); +char *of_modalias(const struct device_node *np, ssize_t *lenp); + /* illegal phandle value (set when unresolved) */ #define OF_PHANDLE_ILLEGAL 0xdeadbeef diff --git a/include/linux/of.h b/include/linux/of.h index f36bab2caa8ccffbd43593d8b6720946e19503e0..d9062d4fbd143d42b6b217942aced66fa34f1c80 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -382,7 +382,6 @@ extern int of_count_phandle_with_args(const struct device_node *np, const char *list_name, const char *cells_name); /* module functions */ -char *of_modalias(const struct device_node *np, ssize_t *lenp); extern int of_request_module(const struct device_node *np); /* phandle iterator functions */ @@ -761,11 +760,6 @@ static inline int of_count_phandle_with_args(const struct device_node *np, return -ENOSYS; } -static inline char *of_modalias(const struct device_node *np, ssize_t *lenp) -{ - return ERR_PTR(-ENODEV); -} - static inline int of_request_module(const struct device_node *np) { return -ENODEV; -- 2.34.1