mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 14:11:52 +00:00
of: merge machine_is_compatible()
Merge common code between PowerPC and Microblaze Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Tested-by: Wolfram Sang <w.sang@pengutronix.de> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
parent
86e0322134
commit
1f43cfb947
@ -318,24 +318,6 @@ void __init early_init_devtree(void *params)
|
||||
pr_debug(" <- early_init_devtree()\n");
|
||||
}
|
||||
|
||||
/**
|
||||
* Indicates whether the root node has a given value in its
|
||||
* compatible property.
|
||||
*/
|
||||
int machine_is_compatible(const char *compat)
|
||||
{
|
||||
struct device_node *root;
|
||||
int rc = 0;
|
||||
|
||||
root = of_find_node_by_path("/");
|
||||
if (root) {
|
||||
rc = of_device_is_compatible(root, compat);
|
||||
of_node_put(root);
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
EXPORT_SYMBOL(machine_is_compatible);
|
||||
|
||||
/*******
|
||||
*
|
||||
* New implementation of the OF "find" APIs, return a refcounted
|
||||
|
@ -754,25 +754,6 @@ void __init early_init_devtree(void *params)
|
||||
DBG(" <- early_init_devtree()\n");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Indicates whether the root node has a given value in its
|
||||
* compatible property.
|
||||
*/
|
||||
int machine_is_compatible(const char *compat)
|
||||
{
|
||||
struct device_node *root;
|
||||
int rc = 0;
|
||||
|
||||
root = of_find_node_by_path("/");
|
||||
if (root) {
|
||||
rc = of_device_is_compatible(root, compat);
|
||||
of_node_put(root);
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
EXPORT_SYMBOL(machine_is_compatible);
|
||||
|
||||
/*******
|
||||
*
|
||||
* New implementation of the OF "find" APIs, return a refcounted
|
||||
|
@ -143,6 +143,27 @@ int of_device_is_compatible(const struct device_node *device,
|
||||
}
|
||||
EXPORT_SYMBOL(of_device_is_compatible);
|
||||
|
||||
/**
|
||||
* machine_is_compatible - Test root of device tree for a given compatible value
|
||||
* @compat: compatible string to look for in root node's compatible property.
|
||||
*
|
||||
* Returns true if the root node has the given value in its
|
||||
* compatible property.
|
||||
*/
|
||||
int machine_is_compatible(const char *compat)
|
||||
{
|
||||
struct device_node *root;
|
||||
int rc = 0;
|
||||
|
||||
root = of_find_node_by_path("/");
|
||||
if (root) {
|
||||
rc = of_device_is_compatible(root, compat);
|
||||
of_node_put(root);
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
EXPORT_SYMBOL(machine_is_compatible);
|
||||
|
||||
/**
|
||||
* of_device_is_available - check if a device is available for use
|
||||
*
|
||||
|
Loading…
Reference in New Issue
Block a user