From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933231AbbI3ScZ (ORCPT ); Wed, 30 Sep 2015 14:32:25 -0400 Received: from mail-la0-f47.google.com ([209.85.215.47]:32860 "EHLO mail-la0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933080AbbI3ScU (ORCPT ); Wed, 30 Sep 2015 14:32:20 -0400 From: Rasmus Villemoes To: Mark Brown , Greg Kroah-Hartman Cc: Rasmus Villemoes , linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] regmap: debugfs: simplify regmap_reg_ranges_read_file() slightly Date: Wed, 30 Sep 2015 20:30:27 +0200 Message-Id: <1443637827-18875-3-git-send-email-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1443637827-18875-1-git-send-email-linux@rasmusvillemoes.dk> References: <1443479342-31621-2-git-send-email-linux@rasmusvillemoes.dk> <1443637827-18875-1-git-send-email-linux@rasmusvillemoes.dk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org By printing the newline character to entry, we can avoid accounting for it manually in several places. Signed-off-by: Rasmus Villemoes --- drivers/base/regmap/regmap-debugfs.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c index bed690740efa..df0d2cd60e39 100644 --- a/drivers/base/regmap/regmap-debugfs.c +++ b/drivers/base/regmap/regmap-debugfs.c @@ -367,17 +367,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); -- 2.1.3