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
nexedi
linux
Commits
f5b313a2
Commit
f5b313a2
authored
Sep 29, 2014
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'regmap/topic/cache' into regmap-next
parents
45942c31
f29a4320
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
2 deletions
+11
-2
drivers/base/regmap/regcache.c
drivers/base/regmap/regcache.c
+11
-2
No files found.
drivers/base/regmap/regcache.c
View file @
f5b313a2
...
...
@@ -269,8 +269,11 @@ static int regcache_default_sync(struct regmap *map, unsigned int min,
map
->
cache_bypass
=
1
;
ret
=
_regmap_write
(
map
,
reg
,
val
);
map
->
cache_bypass
=
0
;
if
(
ret
)
if
(
ret
)
{
dev_err
(
map
->
dev
,
"Unable to sync register %#x. %d
\n
"
,
reg
,
ret
);
return
ret
;
}
dev_dbg
(
map
->
dev
,
"Synced register %#x, value %#x
\n
"
,
reg
,
val
);
}
...
...
@@ -615,8 +618,11 @@ static int regcache_sync_block_single(struct regmap *map, void *block,
ret
=
_regmap_write
(
map
,
regtmp
,
val
);
map
->
cache_bypass
=
0
;
if
(
ret
!=
0
)
if
(
ret
!=
0
)
{
dev_err
(
map
->
dev
,
"Unable to sync register %#x. %d
\n
"
,
regtmp
,
ret
);
return
ret
;
}
dev_dbg
(
map
->
dev
,
"Synced register %#x, value %#x
\n
"
,
regtmp
,
val
);
}
...
...
@@ -641,6 +647,9 @@ static int regcache_sync_block_raw_flush(struct regmap *map, const void **data,
map
->
cache_bypass
=
1
;
ret
=
_regmap_raw_write
(
map
,
base
,
*
data
,
count
*
val_bytes
);
if
(
ret
)
dev_err
(
map
->
dev
,
"Unable to sync registers %#x-%#x. %d
\n
"
,
base
,
cur
-
map
->
reg_stride
,
ret
);
map
->
cache_bypass
=
0
;
...
...
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