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
65c180fd
Commit
65c180fd
authored
Aug 29, 2013
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'regmap/topic/cache' into regmap-rbtree
parents
b6752123
515f2261
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
drivers/base/regmap/internal.h
drivers/base/regmap/internal.h
+1
-1
drivers/base/regmap/regcache.c
drivers/base/regmap/regcache.c
+0
-3
drivers/base/regmap/regmap.c
drivers/base/regmap/regmap.c
+3
-0
No files found.
drivers/base/regmap/internal.h
View file @
65c180fd
...
@@ -223,7 +223,7 @@ int regcache_set_reg_present(struct regmap *map, unsigned int reg);
...
@@ -223,7 +223,7 @@ int regcache_set_reg_present(struct regmap *map, unsigned int reg);
static
inline
bool
regcache_reg_present
(
struct
regmap
*
map
,
unsigned
int
reg
)
static
inline
bool
regcache_reg_present
(
struct
regmap
*
map
,
unsigned
int
reg
)
{
{
if
(
!
map
->
cache_present
)
if
(
!
map
->
cache_present
)
return
tru
e
;
return
fals
e
;
if
(
reg
>
map
->
cache_present_nbits
)
if
(
reg
>
map
->
cache_present_nbits
)
return
false
;
return
false
;
return
map
->
cache_present
[
BIT_WORD
(
reg
)]
&
BIT_MASK
(
reg
);
return
map
->
cache_present
[
BIT_WORD
(
reg
)]
&
BIT_MASK
(
reg
);
...
...
drivers/base/regmap/regcache.c
View file @
65c180fd
...
@@ -241,9 +241,6 @@ int regcache_write(struct regmap *map,
...
@@ -241,9 +241,6 @@ int regcache_write(struct regmap *map,
BUG_ON
(
!
map
->
cache_ops
);
BUG_ON
(
!
map
->
cache_ops
);
if
(
!
regmap_writeable
(
map
,
reg
))
return
-
EIO
;
if
(
!
regmap_volatile
(
map
,
reg
))
if
(
!
regmap_volatile
(
map
,
reg
))
return
map
->
cache_ops
->
write
(
map
,
reg
,
value
);
return
map
->
cache_ops
->
write
(
map
,
reg
,
value
);
...
...
drivers/base/regmap/regmap.c
View file @
65c180fd
...
@@ -1261,6 +1261,9 @@ int _regmap_write(struct regmap *map, unsigned int reg,
...
@@ -1261,6 +1261,9 @@ int _regmap_write(struct regmap *map, unsigned int reg,
int
ret
;
int
ret
;
void
*
context
=
_regmap_map_get_context
(
map
);
void
*
context
=
_regmap_map_get_context
(
map
);
if
(
!
regmap_writeable
(
map
,
reg
))
return
-
EIO
;
if
(
!
map
->
cache_bypass
&&
!
map
->
defer_caching
)
{
if
(
!
map
->
cache_bypass
&&
!
map
->
defer_caching
)
{
ret
=
regcache_write
(
map
,
reg
,
val
);
ret
=
regcache_write
(
map
,
reg
,
val
);
if
(
ret
!=
0
)
if
(
ret
!=
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