Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
linux-seco-imx
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Iterations
Jira
Code
Merge requests
11
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Clea OS
bsp
nxp
linux-seco-imx
Commits
5a86dc1a
Commit
5a86dc1a
authored
16 years ago
by
Michal Simek
Browse files
Options
Downloads
Patches
Plain Diff
microblaze: struct device - replace bus_id with dev_name()
Signed-off-by:
Michal Simek
<
monstr@monstr.eu
>
parent
a8fb748e
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
arch/microblaze/kernel/of_device.c
+4
-6
4 additions, 6 deletions
arch/microblaze/kernel/of_device.c
with
4 additions
and
6 deletions
arch/microblaze/kernel/of_device.c
+
4
−
6
View file @
5a86dc1a
...
...
@@ -13,7 +13,6 @@ void of_device_make_bus_id(struct of_device *dev)
{
static
atomic_t
bus_no_reg_magic
;
struct
device_node
*
node
=
dev
->
node
;
char
*
name
=
dev
->
dev
.
bus_id
;
const
u32
*
reg
;
u64
addr
;
int
magic
;
...
...
@@ -25,9 +24,8 @@ void of_device_make_bus_id(struct of_device *dev)
if
(
reg
)
{
addr
=
of_translate_address
(
node
,
reg
);
if
(
addr
!=
OF_BAD_ADDR
)
{
snprintf
(
name
,
BUS_ID_SIZE
,
"%llx.%s"
,
(
unsigned
long
long
)
addr
,
node
->
name
);
dev_set_name
(
&
dev
->
dev
,
"%llx.%s"
,
(
unsigned
long
long
)
addr
,
node
->
name
);
return
;
}
}
...
...
@@ -37,7 +35,7 @@ void of_device_make_bus_id(struct of_device *dev)
* counter (and pray...)
*/
magic
=
atomic_add_return
(
1
,
&
bus_no_reg_magic
);
snprintf
(
name
,
BUS_ID_SIZE
,
"%s.%d"
,
node
->
name
,
magic
-
1
);
dev_set_name
(
&
dev
->
dev
,
"%s.%d"
,
node
->
name
,
magic
-
1
);
}
EXPORT_SYMBOL
(
of_device_make_bus_id
);
...
...
@@ -58,7 +56,7 @@ struct of_device *of_device_alloc(struct device_node *np,
dev
->
dev
.
archdata
.
of_node
=
np
;
if
(
bus_id
)
strlcpy
(
dev
->
dev
.
bus_id
,
bus_id
,
BUS_ID_SIZE
);
dev_set_name
(
&
dev
->
dev
,
bus_id
);
else
of_device_make_bus_id
(
dev
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment