Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
0a8b13ea
Commit
0a8b13ea
authored
Dec 09, 2016
by
Rob Herring
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "of: base: add support to get machine model name"
This reverts commit
e5269794
.
parent
32bed310
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
38 deletions
+0
-38
drivers/of/base.c
drivers/of/base.c
+0
-32
include/linux/of.h
include/linux/of.h
+0
-6
No files found.
drivers/of/base.c
View file @
0a8b13ea
...
...
@@ -545,38 +545,6 @@ int of_machine_is_compatible(const char *compat)
}
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
*
...
...
include/linux/of.h
View file @
0a8b13ea
...
...
@@ -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_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_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
;
}
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
)
{
return
false
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment