From patchwork Thu Oct 27 09:33:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramesh Shanmugasundaram X-Patchwork-Id: 9399549 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EE72C6059F for ; Thu, 27 Oct 2016 14:34:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D839F2A303 for ; Thu, 27 Oct 2016 14:34:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C3BDA2A2FF; Thu, 27 Oct 2016 14:34:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 815682A304 for ; Thu, 27 Oct 2016 14:34:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S942881AbcJ0O2W (ORCPT ); Thu, 27 Oct 2016 10:28:22 -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 Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie2.idc.renesas.com with ESMTP; 27 Oct 2016 18:42:00 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 3385065414; Thu, 27 Oct 2016 18:42:00 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id E997880030; Thu, 27 Oct 2016 18:41:59 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id CCC808002F; Thu, 27 Oct 2016 18:41:59 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac1.idc.renesas.com with ESMTP id UAN17157; Thu, 27 Oct 2016 18:41:59 +0900 X-IronPort-AV: E=Sophos;i="5.31,404,1473087600"; d="scan'208";a="224086657" Received: from unknown (HELO localhost.localdomain) ([172.29.43.62]) by relmlii2.idc.renesas.com with ESMTP; 27 Oct 2016 18:41:57 +0900 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-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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; \ } \