From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S942896AbcJ0O20 (ORCPT ); Thu, 27 Oct 2016 10:28:26 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:11142 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S942728AbcJ0O2L (ORCPT ); Thu, 27 Oct 2016 10:28:11 -0400 X-IronPort-AV: E=Sophos;i="5.31,404,1473087600"; d="scan'208";a="224086657" From: Ramesh Shanmugasundaram To: mattw@codeaurora.org, mitchelh@codeaurora.org, broonie@kernel.org, linux-kernel@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, chris.paterson2@renesas.com, Ramesh Shanmugasundaram Subject: [PATCH 2/2] regmap: Avoid namespace collision within macro Date: Thu, 27 Oct 2016 10:33:19 +0100 Message-Id: <1477560799-58896-3-git-send-email-ramesh.shanmugasundaram@bp.renesas.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1477560799-58896-1-git-send-email-ramesh.shanmugasundaram@bp.renesas.com> References: <1477560799-58896-1-git-send-email-ramesh.shanmugasundaram@bp.renesas.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Renamed variable "timeout" to "__timeout" to avoid namespace collision. Signed-off-by: Ramesh Shanmugasundaram --- include/linux/regmap.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 9adc7b2..32f339a 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -115,7 +115,7 @@ struct reg_sequence { */ #define regmap_read_poll_timeout(map, addr, val, cond, sleep_us, timeout_us) \ ({ \ - ktime_t timeout = ktime_add_us(ktime_get(), timeout_us); \ + ktime_t __timeout = ktime_add_us(ktime_get(), timeout_us); \ int ret; \ might_sleep_if(sleep_us); \ for (;;) { \ @@ -124,7 +124,7 @@ struct reg_sequence { break; \ if (cond) \ break; \ - if (timeout_us && ktime_compare(ktime_get(), timeout) > 0) { \ + if (timeout_us && ktime_compare(ktime_get(), __timeout) > 0) { \ ret = regmap_read((map), (addr), &(val)); \ break; \ } \ -- 1.9.1