regmap: use less #ifdef for LOG_DEVICE
Subsystems (2)
PATCH 1/1 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 Ben Dooks <[email protected]>
--- drivers/base/regmap/regmap.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/base/regmap/regmap.c +12 -6
@@ -35,6 +35,16 @@*/ #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,unsigned int mask,unsigned int val,bool *change,bool force_write);
@@ -1755,10 +1765,8 @@ int _regmap_write(struct regmap *map, unsigned int reg, } } -#ifdef LOG_DEVICE -if (map->dev &&strcmp (dev_name (map->dev),LOG_DEVICE ) ==0 ) +if (regmap_should_log (map))dev_info (map->dev,"%x <= %x\n" , reg, val); -#endif trace_regmap_reg_write (map, reg, val);
@@ -2450,10 +2458,8 @@ static int _regmap_read(struct regmap *map, unsigned int reg, ret = map->reg_read (context, reg, val);if (ret ==0 ) { -#ifdef LOG_DEVICE -if (map->dev &&strcmp (dev_name (map->dev),LOG_DEVICE ) ==0 ) +if (regmap_should_log (map))dev_info (map->dev,"%x => %x\n" , reg, *val); -#endif trace_regmap_reg_read (map, reg, *val);
Signature · 1 line
2.19.0