Skip to content

Commit

Permalink
regmap: Add functions to check for access on registers
Browse files Browse the repository at this point in the history
We're going to be using these in quite a few places so factor out the
readable/writable/volatile/precious checks.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Mark Brown committed Aug 14, 2011
1 parent 13c5413 commit 8de2f08
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 4 deletions.
5 changes: 5 additions & 0 deletions drivers/base/regmap/internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ struct regmap {
bool (*precious_reg)(struct device *dev, unsigned int reg);
};

bool regmap_writeable(struct regmap *map, unsigned int reg);
bool regmap_readable(struct regmap *map, unsigned int reg);
bool regmap_volatile(struct regmap *map, unsigned int reg);
bool regmap_precious(struct regmap *map, unsigned int reg);

#ifdef CONFIG_DEBUG_FS
extern void regmap_debugfs_initcall(void);
extern void regmap_debugfs_init(struct regmap *map);
Expand Down
6 changes: 2 additions & 4 deletions drivers/base/regmap/regmap-debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,10 @@ static ssize_t regmap_map_read_file(struct file *file, char __user *user_buf,
tot_len = reg_len + val_len + 3; /* : \n */

for (i = 0; i < map->max_register; i++) {
if (map->readable_reg &&
!map->readable_reg(map->dev, i))
if (!regmap_readable(map, i))
continue;

if (map->precious_reg &&
map->precious_reg(map->dev, i))
if (regmap_precious(map, i))
continue;

/* If we're in the region the user is trying to read */
Expand Down
44 changes: 44 additions & 0 deletions drivers/base/regmap/regmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,50 @@

#include "internal.h"

bool regmap_writeable(struct regmap *map, unsigned int reg)
{
if (map->max_register && reg > map->max_register)
return false;

if (map->writeable_reg)
return map->writeable_reg(map->dev, reg);

return true;
}

bool regmap_readable(struct regmap *map, unsigned int reg)
{
if (map->max_register && reg > map->max_register)
return false;

if (map->readable_reg)
return map->readable_reg(map->dev, reg);

return true;
}

bool regmap_volatile(struct regmap *map, unsigned int reg)
{
if (map->max_register && reg > map->max_register)
return false;

if (map->volatile_reg)
return map->volatile_reg(map->dev, reg);

return true;
}

bool regmap_precious(struct regmap *map, unsigned int reg)
{
if (map->max_register && reg > map->max_register)
return false;

if (map->precious_reg)
return map->precious_reg(map->dev, reg);

return false;
}

static void regmap_format_4_12_write(struct regmap *map,
unsigned int reg, unsigned int val)
{
Expand Down

0 comments on commit 8de2f08

Please sign in to comment.