Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33;
From:   =?UTF-8?q?Micha=C5=82=20Winiarski?= <michal.winiarski@intel.com>
To:     <linux-kernel@vger.kernel.org>, <dri-devel@lists.freedesktop.org>,
        "Thomas Zimmermann" <tzimmermann@suse.de>
CC:     =?UTF-8?q?Micha=C5=82=20Winiarski?= <michal.winiarski@intel.com>,
        "Lucas De Marchi" <lucas.demarchi@intel.com>
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>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NFRiUDJHU1JCclhucWVXZWU4WXYwWktHMGcxK1BIUkJNaERNZkJBQmFyRUho?=
 =?utf-8?B?eGRUK3RWN1VOLzY3MFMxbVRBL3dQZS9lNWhvTmJuZC81L3J5Zkl2NFRuQk05?=
 =?utf-8?B?Q2xIUVVMajlVKytwQzJBMjc3MndJY0Z5dnY4SzdMdXFuVk9XdlRWc2ltbkNk?=
 =?utf-8?B?blVHb1lPSUh3eWV1S2NwMGErdUFwaGRHdURhdEdpVCt5dTVFb1BJTDZFQ0tG?=
 =?utf-8?B?K3dJS3llaHNxdS9Od1E1RUtvRExvNjdlWVhTcHBySjh3bm5PMldLbkx3U1NN?=
 =?utf-8?B?K2c1enpvVDdHUlZpOHl4V3d3L0hVT1JVbXc5aHo3VTZFRzh4WnZQUmRjaXBh?=
 =?utf-8?B?cVFMeEJaQnVwN1dJL25VTTBwaDFiMXJ6dUd1WnVkVHR0ZCs0MFFwMWprdXVK?=
 =?utf-8?B?eDE3RUQzSFU5TFFTZzArU281NHl0R3lhVEVLaTFEcDZGTVArUjJNSmtsY2pq?=
 =?utf-8?B?SmtyZkhqZTJ1VlFuYkJ0SE1hd0JQck5ZaUQ5U2JVeTlXbXRDRy9vT0h6bG9q?=
 =?utf-8?B?OU5IN1E3WXFiL2M3SzB0ZlpzVUUyWCtCZG5kZS95aGV2ZFpiTmZTK0RycWMx?=
 =?utf-8?B?VUtxYTB1U2pJVVBhY1lqcklkZFhYd0ZpWjA2ZHpVRG01RHRxd1p3T0xQSWxq?=
 =?utf-8?B?R2ZsSmFzMndtSitiOGtnZVhHbW5wOExoempQUlN5bHVQMkJmUlhiRmhuMlBR?=
 =?utf-8?B?ejVqaXlvQjFkUUdHZXBSU3NIY09iMkMyN3pLaWZVU3FrS3JhRDI3Y0ZETTY4?=
 =?utf-8?B?K1ZMQzZCVjBrZXZ3V2thdjBQY3RDR2ZvSUdTQ0c2WVE1c2JWMDBQc2l3di9U?=
 =?utf-8?B?Sldtc25UQ2tFK2d6bDJmSk9LUXQyN2t0Y1E3SzZRcUc5djUrMHRNWDkvM0VT?=
 =?utf-8?B?a0NMWUJvZDlRakNIOVVkK0tlbFhtd0dGUnVkcDkzeHBRTElKMlI3b3RLdjZV?=
 =?utf-8?B?RW9DVm9pUTFBS2loS2txcEFMN0U1T0ZHRlVzaCtybUNNWFhTTks1VDVUeWFL?=
 =?utf-8?B?NWJSaGFiMjVNdFJKVk5tdk5QK1lWeHQrZ1Bjb1VaRlg2S0E0aXdVQkplUnBa?=
 =?utf-8?B?L3Zrd29Lc0hnNWU5T3BGTUJHV2p5MkNiNG82cTJmZkxjKy9TMFU2M1JvUWt1?=
 =?utf-8?B?MERQeWNIby9md2dWaUhXQTE1UlQ5eHFjcHJZZ0pCdk5ENG5lSWdSajBLNmov?=
 =?utf-8?B?MnF1bEJ5NzRMblVXNXFvbXBLd05FSGdRTmlZdzhXRWo4V1ViY3FJejE3SWVs?=
 =?utf-8?B?YklSWFpubm1menFVMkZUTElFVTFBUlpxQ0ljZ0ZWcWhPdjFkZitXQXR6TENM?=
 =?utf-8?B?dkswcWdXVU5HWnEwK3VJUWpSM2RLQXI3V01YdkNyQW42V2tHc2xwR2tBdGJS?=
 =?utf-8?B?S2h2WUkwSkZSMXZBMms4ZjRTaDdSSjgwZnJsdDFKQ08vS3ZObFJaTGd6RlB6?=
 =?utf-8?B?Z0d3OUY0eWZZSFpNNkhlV2xsOVk1SHJHaHR3Um91WVNuaHRHdi9BY09KL09v?=
 =?utf-8?B?bG1xbm9WdVZ3SjhQNnl1eUQzYjVxYWxRdnRlQXU1ZUJSYmY4TWIyYTFobnQv?=
 =?utf-8?B?RU9Mamc5VUJxeXQyRWdYcXBVQUxjbW9weC9aMVV1aUtybHVLVUgwR2pOcmQ3?=
 =?utf-8?B?RkJQbUJsbVZmQWdKSVJ4aDNJcWR0RjBWUUxZYmVqaTFCRSs5YWc5dzZlRk55?=
 =?utf-8?B?RDAvVU9ieTFtdWcreDM2cnV3dVZRbU9hUUYyMHpUTmN6ZHY0ZlRka3JNZExL?=
 =?utf-8?B?cDRyUHBkNFVWeXU2YThEa0FIbUpVTkV2dHFCNkZNTFA3TmZqUkNPTCsxbzd4?=
 =?utf-8?B?SHlpZngrQ3V1V3Q5VWFGc2lVM2pqTFJabUZYYVpIUWlFaTFxb29uUE9KOHVr?=
 =?utf-8?B?NDIrSnZXNG9GKzJPR0g0THQzSll4eHpGZXoyVUFJek5hVi9hMVA2VUJNdUFD?=
 =?utf-8?B?RGRKTnBRRGtVLzkxd01ldGJLWWswekwwdTRoSGRET1Q4YnVPdm1FTDZWTmV4?=
 =?utf-8?B?QzlVQ3hZZkNjdlgzMU05SWdzR2FnSUQxSjA2eFRKWENlZUJSSHVkLzN5N20w?=
 =?utf-8?B?dGExUTd5L251SlVoWGZUR3FrSU5JdEE4R2tBUTdvQSt2ZUpBNnQzUGVNeU9D?=
 =?utf-8?B?YlZvRWlpeC96cFo0YmY5SmhhRGtxRW54WkJFeitEUTlWazAxL0FEV1lQTDZG?=
 =?utf-8?B?Q2c9PQ==?=
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-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Tue, 24 Oct 2023 04:07:39 -0700 (PDT)

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 <lucas.demarchi@intel.com>
Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
---
 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(&copy, offset_);					\
-	copy;								\
+	struct iosys_map copy_ = *map_;					\
+	iosys_map_incr(&copy_, 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__ */
-- 
2.42.0