Message ID | 20230413163353.3408208-1-arnd@kernel.org |
---|---|
State | New |
Headers | show |
Series | of: move dummy of_device_get_match_data() helper | expand |
On Thu, Apr 13, 2023 at 11:33 AM Arnd Bergmann <arnd@kernel.org> wrote: > > From: Arnd Bergmann <arnd@arndb.de> > > The previous patch only moved the regular declaration but missed > the inline function that is used with CONFIG_OF=n: > > drivers/tty/serial/samsung_tty.c:2034:10: error: implicit declaration of function 'of_device_get_match_data' is invalid in C99 [-Werror,-Wimplicit-function-declaration] > > Fixes: f5a2dc751657 ("of: Move of_device_get_match_data() declaration") Despite multiple reports and having fixed it, I still managed to apply the wrong version of patch. Anyways, I already fixed it. Rob
diff --git a/include/linux/of.h b/include/linux/of.h index f94f9e6476c0..c0d1512f979a 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -815,6 +815,11 @@ static inline bool of_console_check(const struct device_node *dn, const char *na return false; } +static inline const void *of_device_get_match_data(const struct device *dev) +{ + return NULL; +} + static inline const __be32 *of_prop_next_u32(struct property *prop, const __be32 *cur, u32 *pu) { diff --git a/include/linux/of_device.h b/include/linux/of_device.h index 455c51a09091..2c7a3d4bc775 100644 --- a/include/linux/of_device.h +++ b/include/linux/of_device.h @@ -51,11 +51,6 @@ static inline int of_driver_match_device(struct device *dev, static inline void of_device_uevent(const struct device *dev, struct kobj_uevent_env *env) { } -static inline const void *of_device_get_match_data(const struct device *dev) -{ - return NULL; -} - static inline int of_device_modalias(struct device *dev, char *str, ssize_t len) {