Commit 95093762 authored by Ben Dooks's avatar Ben Dooks Committed by Mark Brown

regmap: use less #ifdef for LOG_DEVICE

Move the checking of the LOG_DEVICE into a function to reduce the
number of #ifdefs and  ensure more of the code gets compiled/checked,
and make it easier to change this for internal debugging purposes
(such as checking >1 device).
Signed-off-by: default avatarBen Dooks <ben.dooks@codethink.co.uk>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5b394b2d
...@@ -35,6 +35,16 @@ ...@@ -35,6 +35,16 @@
*/ */
#undef LOG_DEVICE #undef LOG_DEVICE
#ifdef LOG_DEVICE
static inline bool regmap_should_log(struct regmap *map)
{
return (map->dev && strcmp(dev_name(map->dev), LOG_DEVICE) == 0);
}
#else
static inline bool regmap_should_log(struct regmap *map) { return false; }
#endif
static int _regmap_update_bits(struct regmap *map, unsigned int reg, static int _regmap_update_bits(struct regmap *map, unsigned int reg,
unsigned int mask, unsigned int val, unsigned int mask, unsigned int val,
bool *change, bool force_write); bool *change, bool force_write);
...@@ -1755,10 +1765,8 @@ int _regmap_write(struct regmap *map, unsigned int reg, ...@@ -1755,10 +1765,8 @@ int _regmap_write(struct regmap *map, unsigned int reg,
} }
} }
#ifdef LOG_DEVICE if (regmap_should_log(map))
if (map->dev && strcmp(dev_name(map->dev), LOG_DEVICE) == 0)
dev_info(map->dev, "%x <= %x\n", reg, val); dev_info(map->dev, "%x <= %x\n", reg, val);
#endif
trace_regmap_reg_write(map, reg, val); trace_regmap_reg_write(map, reg, val);
...@@ -2450,10 +2458,8 @@ static int _regmap_read(struct regmap *map, unsigned int reg, ...@@ -2450,10 +2458,8 @@ static int _regmap_read(struct regmap *map, unsigned int reg,
ret = map->reg_read(context, reg, val); ret = map->reg_read(context, reg, val);
if (ret == 0) { if (ret == 0) {
#ifdef LOG_DEVICE if (regmap_should_log(map))
if (map->dev && strcmp(dev_name(map->dev), LOG_DEVICE) == 0)
dev_info(map->dev, "%x => %x\n", reg, *val); dev_info(map->dev, "%x => %x\n", reg, *val);
#endif
trace_regmap_reg_read(map, reg, *val); trace_regmap_reg_read(map, reg, *val);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment