Commit 82174a0a authored by Rob Herring's avatar Rob Herring
Browse files

of: Move of_device_get_match_data() declaration 

of_device.h mostly defines functions for bus drivers whereas
of_device_get_match_data() is used by drivers. Let's move it to of.h.

Link: https://lore.kernel.org/r/20230329-dt-cpu-header-cleanups-v1-3-581e2605fe47@kernel.org


Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 4c32fb7d

include/linux/of.h

+6 −0
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ extern int of_n_addr_cells(struct device_node *np); 
extern int of_n_size_cells(struct device_node *np);

extern const struct of_device_id *of_match_node(

	const struct of_device_id *matches, const struct device_node *node);

extern const void *of_device_get_match_data(const struct device *dev);

extern int of_modalias_node(struct device_node *node, char *modalias, int len);

extern void of_print_phandle_args(const char *msg, const struct of_phandle_args *args);

extern int __of_parse_phandle_with_args(const struct device_node *np,
@@ -852,6 +853,11 @@ static inline phys_addr_t of_dma_get_max_cpu_address(struct device_node *np) 
	return PHYS_ADDR_MAX;

}



static inline const void *of_device_get_match_data(const struct device *dev)

{

	return NULL;

}



#define of_match_ptr(_ptr)	NULL

#define of_match_node(_matches, _node)	NULL

#endif /* CONFIG_OF */

include/linux/of_device.h

+0 −7
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ static inline int of_driver_match_device(struct device *dev, 
	return of_match_device(drv->of_match_table, dev) != NULL;

}



extern const void *of_device_get_match_data(const struct device *dev);



extern ssize_t of_device_modalias(struct device *dev, char *str, ssize_t len);

extern int of_device_request_module(struct device *dev);
@@ -63,11 +61,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)

{