From: Rasmus Villemoes Date: Wed, 30 Sep 2015 18:30:27 +0000 (+0200) Subject: regmap: debugfs: simplify regmap_reg_ranges_read_file() slightly X-Git-Tag: firefly_0821_release~176^2~846^2^3 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ca07e9f3cb929548feee8b16715983a4ed009eb6;p=firefly-linux-kernel-4.4.55.git regmap: debugfs: simplify regmap_reg_ranges_read_file() slightly By printing the newline character to entry, we can avoid accounting for it manually in several places. Signed-off-by: Rasmus Villemoes Signed-off-by: Mark Brown --- diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c index 69894bb9b6dd..3f0a7e262d69 100644 --- a/drivers/base/regmap/regmap-debugfs.c +++ b/drivers/base/regmap/regmap-debugfs.c @@ -365,17 +365,15 @@ static ssize_t regmap_reg_ranges_read_file(struct file *file, p = 0; mutex_lock(&map->cache_lock); list_for_each_entry(c, &map->debugfs_off_cache, list) { - entry_len = snprintf(entry, PAGE_SIZE, "%x-%x", + entry_len = snprintf(entry, PAGE_SIZE, "%x-%x\n", c->base_reg, c->max_reg); if (p >= *ppos) { - if (buf_pos + 1 + entry_len > count) + if (buf_pos + entry_len > count) break; memcpy(buf + buf_pos, entry, entry_len); buf_pos += entry_len; - buf[buf_pos] = '\n'; - buf_pos++; } - p += entry_len + 1; + p += entry_len; } mutex_unlock(&map->cache_lock);