From patchwork Tue Oct 24 11:07:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Micha=C5=82_Winiarski?= X-Patchwork-Id: 13434240 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6365CC25B48 for ; Tue, 24 Oct 2023 11:07:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 81F0710E347; Tue, 24 Oct 2023 11:07:31 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by gabe.freedesktop.org (Postfix) with ESMTPS id 835D210E344 for ; Tue, 24 Oct 2023 11:07:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698145648; x=1729681648; h=from:to:cc:subject:date:message-id: content-transfer-encoding:mime-version; bh=5Bdi6X6/cY75CtGnE3qcdg4pXA8z6SQRb61GREk5O0Y=; b=jBhcGrhEDoZ/EZAju9ldvW9jk6YwgbhF4nW/CMgjuZ0dvqXNpZGENUPZ bx/vSKaS0S4fe9ofADN65D7lQ3Xbde8YFYkcGZSoSC6eT3o66PiFXOYRE r86eWPim/d6u6GMGDGkf+C1Upcb4f6BzOL1uRhsry0uGuXFqKPy2C90ri oKt1L4pzN5bVGr9KxSohI26WkaDVJZ3GCZfYIVgpCzmYeG6XaHAFLa4GK KCX4Eg7S4b6Ed1SJm3yFr9KYMkpGqtpbJTV234W8KEd5FZF05FfyJrXcq molm1IIGgjFYZBrQKpEV+Cy9A7iakPpNcYSfa+7eAU81VUXv3QwHP+z6z g==; X-IronPort-AV: E=McAfee;i="6600,9927,10872"; a="8582998" X-IronPort-AV: E=Sophos;i="6.03,247,1694761200"; d="scan'208";a="8582998" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Oct 2023 04:07:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10872"; a="787743165" X-IronPort-AV: E=Sophos;i="6.03,247,1694761200"; d="scan'208";a="787743165" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by orsmga008.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 24 Oct 2023 04:07:27 -0700 Received: from fmsmsx601.amr.corp.intel.com (10.18.126.81) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.32; Tue, 24 Oct 2023 04:07:26 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.32 via Frontend Transport; Tue, 24 Oct 2023 04:07:26 -0700 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.168) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.32; Tue, 24 Oct 2023 04:07:25 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EcMn96A/Y51i7751UAHRPxDCatC6PFEdhLg3MSd8NKKoOShtij9+hRPGYybnInAorMoLi2aJp0P3BbryVmkJnEg45LQcZJwDwzfI1tstWpgweVdZi7VqeEMpGhxovTeB/h+1Uoc1cbU+UH9nR5o9GgYzJLUjYcvBS/8FDUSSIcjaSi1ACVS6xOxGSbtXejaPs2iQrNupjbzhjXzbokaPWOy0s0iWrh7DG6xP3gWF+xLUECDq7CRD2+TQRx612Jxbr7btthxDu1O4NOGmwEIJIsa0Ew3N+J+8835IThAZlmAJAUrCcr+NSYVodkoL4DQQiNM/UvagQZe54sBjiXw43A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=NQsmiX6XQK5AoWVlYxZX0aH5JNRKss7E9hVaFvQ52Jw=; b=V21NYxCDvCFC0h7Nry1/PIi7YcSoIGUeOCza2pWDBWbKNv0w66jKfW6fMPriSWeMSbnC4am+dFm64y3TpJLRYbhuOpn1AxXnUC9PMfuwMJ+NjH2vRcSIMc9Zhu9tEpwtiS+zEzT/v35FI0FWASkfSEJfpJdNtJw/5D1qB4oP8b9dlemNQQ89V1PMUCkUCAjo7wSYy4rpH6Nm/xJJcb4u2QPu2W/8wud9noKgR4ULpme+5LSJm5AaAvYvHIKxFpZz7YANiS/hvzd/C9Q8jE/wgxO0YPf0028yE6Qq95wyuCalB5jXU397NtHM6DJvJNyA+1KueWxNKYGt/X7Eo6I7qw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from DM4PR11MB5373.namprd11.prod.outlook.com (2603:10b6:5:394::7) by DM4PR11MB6042.namprd11.prod.outlook.com (2603:10b6:8:61::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33; Tue, 24 Oct 2023 11:07:18 +0000 Received: from DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::760b:d339:54e1:27bb]) by DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::760b:d339:54e1:27bb%4]) with mapi id 15.20.6907.032; Tue, 24 Oct 2023 11:07:18 +0000 From: =?utf-8?q?Micha=C5=82_Winiarski?= To: , , "Thomas Zimmermann" Subject: [PATCH] iosys-map: Rename locals used inside macros Date: Tue, 24 Oct 2023 13:07:10 +0200 Message-ID: <20231024110710.3039807-1-michal.winiarski@intel.com> X-Mailer: git-send-email 2.42.0 X-ClientProxiedBy: WA0P291CA0019.POLP291.PROD.OUTLOOK.COM (2603:10a6:1d0:1::21) To DM4PR11MB5373.namprd11.prod.outlook.com (2603:10b6:5:394::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM4PR11MB5373:EE_|DM4PR11MB6042:EE_ X-MS-Office365-Filtering-Correlation-Id: 0d3c7ed3-a17d-4c92-a998-08dbd481631a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Qxp00wZalG0XibhM8T9OuMe6y5lF27SuCjBe0CmC5WFvonwvJBwgWDeyYQFdV6xF2Cz95ToILIMpRYVnG2EwSxJhZmqELPuNbBYmOSC1YRMiWF2W4ZIeohPVZVC+/KqQfHCc5UWihFbUF63vMt2mfKg+bYaQjF7FEb3CMxja2NN0/520swXr/XCO6FTOJ13uQTO05UXRvPDL3z1doNCGOmDw5x3jb/ZU/HOefURH8x6zR9akGrx8WvrGbY10WyRYTMUdkPRhoX19CurUCE7W3bQqtol7vnY3uCX81biPC1FNWFQckOatiMZEGBaqa69pOt6vJZCYSg+SCe4jZ/uhc96EVoacZrfa+c7CZaTEdhIHgDmI4B/VUzVF6ZKahl7zK7noaZbilh6MVE1lHI6qLRyYfonxKhFVdqd7uM4dSIiDMZTXjQAi1ci7gPmyDry/TMamhTq4nI08h44QdL2Xivj2awuqqa7VDbUbzLhQLR94smY4ju/H7W6l+604U9cfzHt+rrrveawdGpuGTCdRkpPbnECOnVnaJ03f1PbzZIfZiLb5QAFaHP2q2D7coIPl X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5373.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(396003)(346002)(136003)(366004)(376002)(39860400002)(230922051799003)(64100799003)(186009)(451199024)(1800799009)(66556008)(66946007)(86362001)(66476007)(41300700001)(54906003)(6916009)(316002)(6506007)(6666004)(5660300002)(6486002)(478600001)(6512007)(8936002)(8676002)(4326008)(36756003)(2906002)(1076003)(26005)(38100700002)(2616005)(82960400001)(107886003)(83380400001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?4TbP2GSRBrXnqeWee8Yv0ZKG0g1+?= =?utf-8?q?PHRBMhDMfBABarEHhxdT+tV7UN/670S1mTA/wPe/e5hoNbnd/5/ryfIv4TnBM9ClH?= =?utf-8?q?QULj9U++pC2A2772wIcFyvv8K7LuqnVOWvTVsimnCdnUGoYOIHwyeuKcp0a+uAphd?= =?utf-8?q?GuDatGiT+yu5EoPIL6ECKF+wIKyehsqu/NwQ5EKoDLo67eYXSpprJ8wnnO2WKnLwS?= =?utf-8?q?SM+g5zzoT7GRVi8yxWww/HUORUmw9hz7U6EG8xZvPRdcipaqQLxBZBup7WI/nUM0p?= =?utf-8?q?h1b1rzuGuZudTttd+40Qp1jkuuJx17ED3HU9LQSg0+So54ytGyaTEKi1Dp6FMP+R2?= =?utf-8?q?MJklcjjJkrfHje2uVQnbBtHMawBPrNYiD9SbUy9WmtCG/oOHzloj9NH7Q7Yqb/c7K?= =?utf-8?q?0tfZsUE2X+Bdnde/yhevdZbNfS+Drqc1UKqa0uSjIUPacYjrIddXXwFiZ06dzUDm5?= =?utf-8?q?DtqwZwOLPIljGflJas2wmJ+b8kgeXGmnp8LhzjPRSyluP2BfRXbFhn2PQz5jiyoB1?= =?utf-8?q?dQGGepRSsHcOb2C27zKifUSqkKraD27cFDM68+VLC6BV0kevwWkav0PctCGfoIGSC?= =?utf-8?q?G6YQ5sbV00Psiwv/TJWmsnTCkE+gzl2fJOKQt27ktcQ7K6QqG9v5+0tMX9/3ESkCL?= =?utf-8?q?YBod9QjCH9Ud+KelXmwGFRudp93xpQLIJ2R7otKv6UEoCVoiQ1AKihKkqpAL7E5OF?= =?utf-8?q?GFUsh+rmCMXXSNK5T5TyaK5bRhab25MtRJVNmvNP+YVxt+gPcoUZFX6KA4iwUBJeR?= =?utf-8?q?pZ/vkwoKsHg5e9OpFMBGWjy2Cb4o6q2ffLc+/S0U63RoQku0DPycHo/fwgViHWA15?= =?utf-8?q?RT9xqcprYgJBvND4neIgRj0K6j/2qulBy74LnUW5qompKwNEHgQNiYw8WEj8WUbcq?= =?utf-8?q?Iz17IelbIRXZnnmfzqU2FTLIEU1ARZqCIcgFVqhOv1df+WAtzLCLvK0qgWUNGZq0+?= =?utf-8?q?uIQjR3dKAr7WMXvCrAn6WkGslpGkAtbRKhvYI0JFR1vA2k8f4Sh7RJ80frlt1JCO/?= =?utf-8?q?KvNlRZLgzFPzgGw9F4yfYHZM6HeWll9Y5HrGhtwRouYSnhtGv/AcOJ/OolmqnoVuV?= =?utf-8?q?wJ8P6yuyD3b5qalQvteAu5eBRbf8Mb2a1hnt/EOLjg9UBqyt2EgXqpUALcmopx/Z1?= =?utf-8?q?UuiKrluKUH0GjNrd7FBPmBlmVfAgJIRxh3IqdtF0VQLYbeji1BE+9ag9w6eFNyD0/?= =?utf-8?q?UOby1mug+x36ruwuVQmOaQF20zTNczdv4fTdkrMdLKp4rPpd4UVyu6a8DkAHmJUNE?= =?utf-8?q?vtqB6FMLP7NfjRCOL+1o7xHyifx+CuuWt9UaFsiU3jjLRZmFXaZHQiEi1qoonPOJ8?= =?utf-8?q?uk42+JvW4oF+2OGH4Lt3JYxxzFez2UAIzNaV/a1P6UBMuACDdJNpQDkU/91wMetbK?= =?utf-8?q?Yk0zL0u4hHdDOT8buOvmEL6VNexC9UCxYfCcvX31M9IgsGagID1J06xTJXCeeBRHu?= =?utf-8?q?d/3y7m0ta1Q7y/nuJUhXfTGqkINItA8GkAQ7oA+veJA6t3PeMyOCbVoEiix/zpZ4b?= =?utf-8?q?f9JhaDkqEnxZBEz+DQ9Vk01/ADWYPL6FCg=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 0d3c7ed3-a17d-4c92-a998-08dbd481631a X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Oct 2023 11:07:18.3039 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: NdHuFq1XMv5GhDqRlWQvz7wfv1TU8IEQw6uk50BnxtWa0Z/RlUgUUArh/WhNl+qO8sIn4SvwQT0Hd7FTqLbt2oeGglLIVN4PD+6W5coK3S0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB6042 X-OriginatorOrg: intel.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lucas De Marchi , =?utf-8?q?Micha=C5=82_Winiar?= =?utf-8?q?ski?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Widely used variable names can be used by macro users, potentially leading to name collisions. Suffix locals used inside the macros with an underscore, to reduce the collision potential. Suggested-by: Lucas De Marchi Signed-off-by: Michał Winiarski Reviewed-by: Lucas De Marchi --- include/linux/iosys-map.h | 44 +++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/include/linux/iosys-map.h b/include/linux/iosys-map.h index cb71aa616bd37..bb3a8c30fb920 100644 --- a/include/linux/iosys-map.h +++ b/include/linux/iosys-map.h @@ -168,9 +168,9 @@ struct iosys_map { * about the use of uninitialized variable. */ #define IOSYS_MAP_INIT_OFFSET(map_, offset_) ({ \ - struct iosys_map copy = *map_; \ - iosys_map_incr(©, offset_); \ - copy; \ + struct iosys_map copy_ = *map_; \ + iosys_map_incr(©_, offset_); \ + copy_; \ }) /** @@ -391,14 +391,14 @@ static inline void iosys_map_memset(struct iosys_map *dst, size_t offset, * Returns: * The value read from the mapping. */ -#define iosys_map_rd(map__, offset__, type__) ({ \ - type__ val; \ - if ((map__)->is_iomem) { \ - __iosys_map_rd_io(val, (map__)->vaddr_iomem + (offset__), type__);\ - } else { \ - __iosys_map_rd_sys(val, (map__)->vaddr + (offset__), type__); \ - } \ - val; \ +#define iosys_map_rd(map__, offset__, type__) ({ \ + type__ val_; \ + if ((map__)->is_iomem) { \ + __iosys_map_rd_io(val_, (map__)->vaddr_iomem + (offset__), type__); \ + } else { \ + __iosys_map_rd_sys(val_, (map__)->vaddr + (offset__), type__); \ + } \ + val_; \ }) /** @@ -413,13 +413,13 @@ static inline void iosys_map_memset(struct iosys_map *dst, size_t offset, * or if pointer may be unaligned (and problematic for the architecture * supported), use iosys_map_memcpy_to() */ -#define iosys_map_wr(map__, offset__, type__, val__) ({ \ - type__ val = (val__); \ - if ((map__)->is_iomem) { \ - __iosys_map_wr_io(val, (map__)->vaddr_iomem + (offset__), type__);\ - } else { \ - __iosys_map_wr_sys(val, (map__)->vaddr + (offset__), type__); \ - } \ +#define iosys_map_wr(map__, offset__, type__, val__) ({ \ + type__ val_ = (val__); \ + if ((map__)->is_iomem) { \ + __iosys_map_wr_io(val_, (map__)->vaddr_iomem + (offset__), type__); \ + } else { \ + __iosys_map_wr_sys(val_, (map__)->vaddr + (offset__), type__); \ + } \ }) /** @@ -485,9 +485,9 @@ static inline void iosys_map_memset(struct iosys_map *dst, size_t offset, * The value read from the mapping. */ #define iosys_map_rd_field(map__, struct_offset__, struct_type__, field__) ({ \ - struct_type__ *s; \ + struct_type__ *s_; \ iosys_map_rd(map__, struct_offset__ + offsetof(struct_type__, field__), \ - typeof(s->field__)); \ + typeof(s_->field__)); \ }) /** @@ -508,9 +508,9 @@ static inline void iosys_map_memset(struct iosys_map *dst, size_t offset, * usage and memory layout. */ #define iosys_map_wr_field(map__, struct_offset__, struct_type__, field__, val__) ({ \ - struct_type__ *s; \ + struct_type__ *s_; \ iosys_map_wr(map__, struct_offset__ + offsetof(struct_type__, field__), \ - typeof(s->field__), val__); \ + typeof(s_->field__), val__); \ }) #endif /* __IOSYS_MAP_H__ */