Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-17 18:56:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "of: base: add support to get machine model name"

Browse Source 
This reverts commit e5269794d2e9046dd45be15bdb213a229df46b7e.
This commit is contained in:
Rob Herring 2016-12-09 10:33:48 -06:00
parent 32bed310ad
commit 0a8b13eab1
2 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/of/base.c
View File

@ -545,38 +545,6 @@ int of_machine_is_compatible(const char *compat)
} }
EXPORT_SYMBOL(of_machine_is_compatible); EXPORT_SYMBOL(of_machine_is_compatible);
/**
* of_machine_get_model_name - Find and read the model name or the compatible
* value for the machine.
* @model: pointer to null terminated return string, modified only if
* return value is 0.
*
* Returns a string containing either the model name or the compatible value
* of the machine if found, else return error.
*
* Search for a machine model name or the compatible if model name is missing
* in a device tree node and retrieve a null terminated string value (pointer
* to data, not a copy). Returns 0 on success, -EINVAL if root of the device
* tree is not found and other error returned by of_property_read_string on
* failure.
*/
int of_machine_get_model_name(const char **model)
{
int error;
if (!of_node_get(of_root))
return -EINVAL;
error = of_property_read_string(of_root, "model", model);
if (error)
error = of_property_read_string_index(of_root, "compatible",
0, model);
of_node_put(of_root);
return error;
}
EXPORT_SYMBOL(of_machine_get_model_name);
/** /**
* __of_device_is_available - check if a device is available for use * __of_device_is_available - check if a device is available for use
* *

6
include/linux/of.h
View File

@ -367,7 +367,6 @@ extern int of_alias_get_id(struct device_node *np, const char *stem);
extern int of_alias_get_highest_id(const char *stem); extern int of_alias_get_highest_id(const char *stem);
extern int of_machine_is_compatible(const char *compat); extern int of_machine_is_compatible(const char *compat);
extern int of_machine_get_model_name(const char **model);
extern int of_add_property(struct device_node *np, struct property *prop); extern int of_add_property(struct device_node *np, struct property *prop);
extern int of_remove_property(struct device_node *np, struct property *prop); extern int of_remove_property(struct device_node *np, struct property *prop);
@ -789,11 +788,6 @@ static inline int of_machine_is_compatible(const char *compat)
return 0; return 0;
} }
static inline int of_machine_get_model_name(const char **model)
{
return -EINVAL;
}
static inline bool of_console_check(const struct device_node *dn, const char *name, int index) static inline bool of_console_check(const struct device_node *dn, const char *name, int index)
{ {
return false; return false;